--- pop_uidl.c.old	Fri Jul 10 03:44:08 1998
+++ pop_uidl.c	Mon Apr 17 22:56:13 2000
@@ -98,6 +98,7 @@
 {
   static char buf[MAXLINELEN];
   char *cp;
+  char *bp;
 
     fseek(p->drop, mp->offset, 0);
     while (fgets(buf, sizeof(buf), p->drop) != NULL) {
@@ -105,6 +106,8 @@
       if (!strncasecmp("From:", buf, 5)) {
 	cp = index(buf, ':');
 	while (*++cp && (*cp == ' ' || *cp == '\t'));
+	if ((bp = index(cp, NEWLINE)) != NULL)
+	  *bp = 0;
 	return(cp);
       }
     }
@@ -165,7 +168,7 @@
 
 	    sprintf(buffer, "%d %s", x, mp->uidl_str);
 	    if (nl = index(buffer, NEWLINE)) *nl = 0;	    
-	    sprintf(buffer, "%s %d %.128s", buffer, mp->length, from_hdr(p, mp));
+	    sprintf(buffer, "%s %d %.128s\n", buffer, mp->length, from_hdr(p, mp));
 	    pop_sendline(p, buffer);
         }
     }