diff --git a/src/config.h b/src/config.h
index 8feeb47..d10be14 100644
--- a/src/config.h
+++ b/src/config.h
@@ -11,7 +11,7 @@
 
 #define VERSION "1.3.4"
 
-#define BUILD 992
+#define BUILD 993
 
 #define HOSTID "mailarchiver"
 
diff --git a/src/session.c b/src/session.c
index e0ef034..d5b73d0 100644
--- a/src/session.c
+++ b/src/session.c
@@ -195,7 +195,9 @@
       p += puflen;
 
       if(puflen > 0){
-         if(session->protocol_state == SMTP_STATE_DATA){
+         // pass the puffer to process_data() only if there was an '\n'
+         // on the line or the puffer does not start with a period
+         if(session->protocol_state == SMTP_STATE_DATA && (rc == OK || puf[0] != '.')){
             process_data(session, puf, puflen);
          }
          else if(session->protocol_state == SMTP_STATE_BDAT){