Add "Mail-Followup-To" header to the list of headers to decode by default

[mimedecode.git] / mimedecode.py

diff --git a/mimedecode.py b/mimedecode.py
index f7f2e7fb2db8d62e2dd679fba3e5374bef78fce1..9a23b7f36d934d6b828b35d151fdb634f81191b1 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -261,7 +261,7 @@ def decode_message(msg):
 
     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,11 +273,15 @@ class GlobalOptions:
 
     host_name = None
 
-    decode_headers = ["From", "Subject"] # A list of headers to decode
+    # A list of headers to decode
+    decode_headers = ["From", "To", "Cc", "Reply-To", "Mail-Followup-To",
+                      "Subject"]
+
+    # A list of headers' parameters to decode
     decode_header_params = [
         ("Content-Type", "name"),
         ("Content-Disposition", "filename"),
-    ] # A list of headers' parameters to decode
+    ]
 
     totext_mask = [] # A list of content-types to decode
     binary_mask = [] # A list to pass through