diff -ruN courier-imap-4.0.2.orig/imap/pop3dserver.c courier-imap-4.0.2/imap/pop3dserver.c
--- courier-imap-4.0.2.orig/imap/pop3dserver.c	2005-03-01 13:13:53 +1000
+++ courier-imap-4.0.2/imap/pop3dserver.c	2005-04-02 23:33:51 +1100
@@ -672,7 +672,7 @@
 		exit(1);
 	}
 	if (lastc != '\n')	printf("\r\n");
-	printf(".\r\n");
+	printf("\r\n.\r\n");
 	fflush(stdout);
 	fclose(f);
 	if (lptr)	return;