diff --git a/scheme/lib/pop3.scm b/scheme/lib/pop3.scm
index 1d3b2a2..41c2ad1 100644
--- a/scheme/lib/pop3.scm
+++ b/scheme/lib/pop3.scm
@@ -228,8 +228,8 @@
 
 (define (pop3-read-response connection)
   (let* ((sock (pop3-connection-command-socket connection))
-         (IN (socket:inport sock))
-         (line (read-line IN)))
+         (in (socket:inport sock))
+         (line (read-crlf-line in)))
     (pop3-log connection (format #f "-> ~a" line))
     line))
 
@@ -253,9 +253,9 @@
 
 (define (pop3-send-command connection command)
   (let* ((sock (pop3-connection-command-socket connection))
-         (OUT (socket:outport sock)))
-    (write-string command OUT)
-    (write-crlf OUT)
+         (out (socket:outport sock)))
+    (write-string command out)
+    (write-crlf out)
     (pop3-log connection (format #f "<- ~a" command))
     (pop3-handle-response (pop3-read-response connection) command)))
 
@@ -267,7 +267,7 @@
 ; e.g. in FreeBSD it is called md5
 
 (define (pop3-dump fd)
-  (let loop ((line (read-line fd)))
+  (let loop ((line (read-crlf-line fd)))
        (cond ((and (not (eof-object? line))
                    (not (equal? line ".\r")))
               (and (eq? 0 (string-index line #\.)) ; fix byte-stuffed lines
@@ -275,6 +275,6 @@
                    (set! line (substring line 1 (string-length line))))
 	      (write-string line)
               (newline)
-	      (loop (read-line fd))))))
+	      (loop (read-crlf-line fd))))))
 
 ;; EOF