diff --git a/emailtunnel/__init__.py b/emailtunnel/__init__.py
index d6c19c5..437a6c5 100644
--- a/emailtunnel/__init__.py
+++ b/emailtunnel/__init__.py
@@ -355,6 +355,11 @@ def process_message(self, peer, mailfrom, rcpttos, str_data):
         """
 
         data = str_data.encode('latin1')
+        if six.PY2:
+            if data.startswith('From nobody'):
+                # Remove first line which contains useless envelope info
+                nl = data.index('\n')
+                data = data[nl+1:]
 
         try:
             ipaddr, port = peer