Merge pull request #24 from chadgates/mdn_originator

If no Original-Recipient provided, fall back to mandatory Final-Recip…
abhishek-ram · Oct 23, 2020 · c09648b · c09648b
2 parents b4e65f4 + 24b01bb
commit c09648b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pyas2lib/as2.py b/pyas2lib/as2.py
@@ -978,5 +978,8 @@ def detect_mdn(self):
             if part.get_content_type() == "message/disposition-notification":
                 mdn = part.get_payload()[0]
                 message_id = mdn.get("Original-Message-ID").strip("<>")
-                message_recipient = mdn.get("Original-Recipient").split(";")[1].strip()
+                if mdn.get("Original-Recipient"):
+                    message_recipient = mdn.get("Original-Recipient").split(";")[1].strip()
+                else:
+                    message_recipient = mdn.get("Final-Recipient").split(";")[1].strip()
         return message_id, message_recipient