1 files changed, 3 insertions, 1 deletions

diff --git a/lib-src/pop.c b/lib-src/pop.c
index 9292998e288..48e9df7b5d5 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1316,7 +1316,9 @@ getline (server)
                 fprintf (stderr, "<<< %s\n", server->buffer);
               return (server->buffer);
             }
-          search_offset += ret;
+          /* As above, the "- 1" here is to account for the fact that
+             we may have read a CR without its accompanying LF. */
+          search_offset += ret - 1;
         }
     }