X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=4776126474cbd4e00b036cdfd368f89d46219108;hb=0d38385113a4e8093ff7fc11f3e11a5b12e5a820;hp=d3d23ff2595418c7cc68557d63d822802caf865e;hpb=70c8a3a1d7f08e10767f181a72314e9257022745;p=mimedecode.git

diff --git a/mimedecode.py b/mimedecode.py
index d3d23ff..4776126 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -234,34 +234,34 @@ def decode_part(msg):
 def decode_multipart(msg):
     "Decode multipart"
 
-    if msg.is_multipart():
-        decode_headers(msg)
-        output_headers(msg)
+    decode_headers(msg)
+    output_headers(msg)
 
-        if msg.preamble: # Preserve the first part, it is probably not a RFC822-message
-            output(msg.preamble) # Usually it is just a few lines of text (MIME warning)
+    if msg.preamble: # Preserve the first part, it is probably not a RFC822-message
+        output(msg.preamble) # Usually it is just a few lines of text (MIME warning)
 
-        boundary = msg.get_boundary()
+    boundary = msg.get_boundary()
 
-        for subpart in msg.get_payload():
-            if boundary:
-                output("\n--%s\n" % boundary)
+    for subpart in msg.get_payload():
+        if boundary:
+            output("\n--%s\n" % boundary)
 
-            # Recursively decode all parts of the subpart
-            decode_message(subpart)
+        # Recursively decode all parts of the subpart
+        decode_message(subpart)
 
-        if boundary:
-            output("\n--%s--\n" % boundary)
+    if boundary:
+        output("\n--%s--\n" % boundary)
+
+    if msg.epilogue:
+        output(msg.epilogue)
 
-        if msg.epilogue:
-            output(msg.epilogue)
 
 def decode_message(msg):
     "Decode message"
 
     if msg.is_multipart():
         decode_multipart(msg)
-    elif msg.has_key("Content-Type"): # Simple one-part message - decode it
+    elif len(msg): # Simple one-part message (there are headers) - decode it
         decode_part(msg)
     else: # Not a message, just text - copy it literally
         output(msg.as_string())
@@ -273,7 +273,7 @@ class GlobalOptions:
 
     host_name = None
 
-    decode_headers = ["From", "Subject"] # A list of headers to decode
+    decode_headers = ["From", "To", "Subject"] # A list of headers to decode
     decode_header_params = [
         ("Content-Type", "name"),
         ("Content-Disposition", "filename"),