From f366b3aa7fe88f38673727f37aa018f4ee4aad98 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 12 Nov 2013 11:49:43 -0200
Subject: Remove 'multipart/encrypted' header after decrypting incoming mail.
 Closes #4454.

---
 mail/src/leap/mail/imap/fetch.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mail/src')

diff --git a/mail/src/leap/mail/imap/fetch.py b/mail/src/leap/mail/imap/fetch.py
index 4d474089..bc04bd15 100644
--- a/mail/src/leap/mail/imap/fetch.py
+++ b/mail/src/leap/mail/imap/fetch.py
@@ -387,6 +387,8 @@ class LeapIncomingMail(object):
                 decrdata = decrdata.encode(encoding, 'replace')
 
             decrmsg = parser.parsestr(decrdata)
+            # remove original message's multipart/encrypted content-type
+            del(origmsg['content-type'])
             # replace headers back in original message
             for hkey, hval in decrmsg.items():
                 try:
-- 
cgit v1.2.3