diff --git a/Changes b/Changes
index 1cb12f7..7daf888 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 0.20 - development
 
+  Fix the "too many dots in the beginning of the line" bug.
+
   Add munge_subject_threshold and reject_threshold options to the
   spamassassin plugin.  Add documentation to the spamassassin plugin.
 
diff --git a/lib/Qpsmtpd/SMTP.pm b/lib/Qpsmtpd/SMTP.pm
index e004f51..62b93bb 100644
--- a/lib/Qpsmtpd/SMTP.pm
+++ b/lib/Qpsmtpd/SMTP.pm
@@ -286,6 +286,7 @@ sub data {
     # add a transaction->blocked check back here when we have line by line plugin access...
     unless (($max_size and $size > $max_size)) {
       s/\r\n$/\n/;
+      s/^\.\./\./;
       if ($in_header and m/^\s*$/) {
 	$in_header = 0;
 	my @header = split /\n/, $buffer;