diff --git a/scheme/lib/smtp.scm b/scheme/lib/smtp.scm
index 19de5fc..a3bdf87 100644
--- a/scheme/lib/smtp.scm
+++ b/scheme/lib/smtp.scm
@@ -218,7 +218,9 @@
 		    
 		      (else (error "Message must be string or input-port.")))
 
-		(write-string "\r\n.\r\n" p)
+		(write-crlf p)
+		(write-char #\. p)
+		(write-crlf p)
 		(force-output p)
 		(handle-smtp-reply socket))))))))