1 files changed, 6 insertions, 2 deletions
diff --git a/driver.c b/driver.c
index 0a66c2e6..be0f3947 100644
--- a/driver.c
+++ b/driver.c
@@ -1079,8 +1079,12 @@ int delimited;		/* does the protocol use a message delimiter? */
 	{
 	    int	n;
 
-	    /* SMTP byte-stuffing */
-	    if (*buf == '.')
+	    /*
+	     * SMTP byte-stuffing.  We only do this if the protocol does *not*
+	     * use .<CR><LF> as EOM.  If it does, the server will already have
+	     * decorated any . lines it sends back up.
+	     */
+	    if (!delimited && *buf == '.')
 		if (sinkfp && ctl->mda)
 		    fputs(".", sinkfp);
 		else if (ctl->smtp_socket != -1)