Remove envelope line from message

This appears in Python 2 and not in Python 3 for some reason
TK-IT · May 1, 2015 · 911f831 · 911f831
1 parent 6321da2
commit 911f831
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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