diff options
| author | Kali Kaneko <kali@leap.se> | 2013-11-12 23:24:59 -0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-11-12 23:24:59 -0200 |
| commit | dddc6ff461ffa85749900b6a85a3296d6e609d60 (patch) | |
| tree | cc1833e9c3ec3237a3070187cfa6dfc9a284c7b3 | |
| parent | 24b78557e8a1d31971a6b8c1fcc1269d7c5e4709 (diff) | |
| parent | a63fb0de4f9660dac955c6669860ce35c72fbf9e (diff) | |
Merge remote-tracking branch 'drebs/bug/4454_remove-multipart-encrypted-header-after-decrypting' into develop
| -rw-r--r-- | changes/bug_4454_remove-multipart-encrypted-header-after-decrypting | 2 | ||||
| -rw-r--r-- | src/leap/mail/imap/fetch.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug_4454_remove-multipart-encrypted-header-after-decrypting b/changes/bug_4454_remove-multipart-encrypted-header-after-decrypting new file mode 100644 index 0000000..8aa0aaa --- /dev/null +++ b/changes/bug_4454_remove-multipart-encrypted-header-after-decrypting @@ -0,0 +1,2 @@ + o Remove 'multipart/encrypted' header after decrypting incoming mail. Closes + #4454. diff --git a/src/leap/mail/imap/fetch.py b/src/leap/mail/imap/fetch.py index 4d47408..bc04bd1 100644 --- a/src/leap/mail/imap/fetch.py +++ b/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: |