summaryrefslogtreecommitdiff
path: root/src/leap/mail
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-12-19 23:13:43 -0200
committerdrebs <drebs@leap.se>2013-12-19 23:13:43 -0200
commit05884e9fd9a6131eaff6f86b37af8dc7b0a88217 (patch)
tree204f7abb9a6bf5e0e752f148c3c6f2ce760172ab /src/leap/mail
parente14cbdd27cfae72c3fa851441853d1bd93a33dda (diff)
Only try to fetch keys for multipart signed or encrypted messages when fetching mail (#4671).
Diffstat (limited to 'src/leap/mail')
-rw-r--r--src/leap/mail/imap/fetch.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/mail/imap/fetch.py b/src/leap/mail/imap/fetch.py
index f69681a..b1c34ba 100644
--- a/src/leap/mail/imap/fetch.py
+++ b/src/leap/mail/imap/fetch.py
@@ -389,7 +389,9 @@ class LeapIncomingMail(object):
# try to obtain sender public key
senderPubkey = None
fromHeader = msg.get('from', None)
- if fromHeader is not None:
+ if fromHeader is not None \
+ and (msg.get_content_type() == 'multipart/encrypted' \
+ or msg.get_content_type() == 'multipart/signed'):
_, senderAddress = parseaddr(fromHeader)
try:
senderPubkey = self._keymanager.get_key_from_cache(