summaryrefslogtreecommitdiff
path: root/mail/src
diff options
context:
space:
mode:
Diffstat (limited to 'mail/src')
-rw-r--r--mail/src/leap/mail/incoming/service.py2
-rw-r--r--mail/src/leap/mail/incoming/tests/test_incoming_mail.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/mail/src/leap/mail/incoming/service.py b/mail/src/leap/mail/incoming/service.py
index 0b2f7c2c..23c216ca 100644
--- a/mail/src/leap/mail/incoming/service.py
+++ b/mail/src/leap/mail/incoming/service.py
@@ -435,7 +435,7 @@ class IncomingMail(Service):
def add_leap_header(ret):
decrmsg, signkey = ret
- if (senderAddress is None or
+ if (senderAddress is None or signkey is None or
isinstance(signkey, keymanager_errors.KeyNotFound)):
decrmsg.add_header(
self.LEAP_SIGNATURE_HEADER,
diff --git a/mail/src/leap/mail/incoming/tests/test_incoming_mail.py b/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
index 0745ee03..f8652b3b 100644
--- a/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
+++ b/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
@@ -46,6 +46,8 @@ from leap.soledad.common.crypto import (
ENC_SCHEME_KEY,
)
+# TODO: add some tests for encrypted, unencrypted, signed and unsgined messages
+
class IncomingMailTestCase(TestCaseWithKeyManager):
"""