diff -ruN tpop3d-cvs/connection.c tpop3d/connection.c
--- tpop3d-cvs/connection.c	2003-01-23 20:51:55.000000000 +0100
+++ tpop3d/connection.c	2003-07-13 16:03:14.000000000 +0200
@@ -438,7 +438,7 @@
     p += skip;
 
     /* Send the message headers */
-    do {
+	 while (p < r && *p != '\n') {
         q = memchr(p, '\n', r - p);
         if (!q) q = r;
         errno = 0;
@@ -454,7 +454,7 @@
         nwritten += q - p + 2;
 
         p = q + 1;
-    } while (p < r && *p != '\n');
+    }
 
     ++p;