diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-12-20 12:33:02 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-12-20 12:33:02 -0300 |
| commit | 460b704771d518e76cfe10cda520a1a0a688ce8c (patch) | |
| tree | cb69e61c053e0ad2e6a6993cbcb68b5c589cc732 /src/leap/mail/imap/fetch.py | |
| parent | a008fba77abbdb571fa3990a61a21827cf77a777 (diff) | |
| parent | 8547783e7fe517772d610b0ae73b0b6be6450e98 (diff) | |
Merge remote-tracking branch 'refs/remotes/drebs/feature/4335_4671' into develop
Diffstat (limited to 'src/leap/mail/imap/fetch.py')
| -rw-r--r-- | src/leap/mail/imap/fetch.py | 4 |
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( |