diff --git a/src/bogofilter-smtpd.cpp b/src/bogofilter-smtpd.cpp
index 350c2c6..dc7d4de 100644
--- a/src/bogofilter-smtpd.cpp
+++ b/src/bogofilter-smtpd.cpp
@@ -47,6 +47,13 @@ void on_data_line(protocol::protocol_t& protocol, protocol::message_t message) {
                 return;
             }
 
+            if(data_line.substr(0, 6) == "X-Spam" ||
+               data_line.substr(0, 10) == "X-Bogosity") {
+                cerr << "Found and stripped incoming spam filter header:" << endl;
+                cerr << data_line << endl;
+                return;
+            }
+
             if(data_line.substr(0, 5) == "From:" ||
                data_line.substr(0, 8) == "Subject:") {
                 cerr << data_line << endl;
diff --git a/src/protocol/protocol.cpp b/src/protocol/protocol.cpp
index 830cdbd..8fc2895 100644
--- a/src/protocol/protocol.cpp
+++ b/src/protocol/protocol.cpp
@@ -116,6 +116,7 @@ namespace protocol {
             std::getline(in, line);
             absorb(line);
         }
+        cerr << "EOF reached" << endl;
     }
 
     session_key_t session_key_from(const token::list_t& tokens) {