summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/leap/mail/imap/mailbox.py3
-rw-r--r--src/leap/mail/outgoing/service.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/leap/mail/imap/mailbox.py b/src/leap/mail/imap/mailbox.py
index d545c00..e70a1d8 100644
--- a/src/leap/mail/imap/mailbox.py
+++ b/src/leap/mail/imap/mailbox.py
@@ -91,6 +91,9 @@ def make_collection_listener(mailbox):
def __init__(self, mbox):
self.mbox = mbox
+ # See #8083, pixelated adaptor seems to be misusing this class.
+ self.mailbox_name = self.mbox.mbox_name
+
def __hash__(self):
return hash(self.mbox.mbox_name)
diff --git a/src/leap/mail/outgoing/service.py b/src/leap/mail/outgoing/service.py
index 335cae4..95d3e79 100644
--- a/src/leap/mail/outgoing/service.py
+++ b/src/leap/mail/outgoing/service.py
@@ -224,7 +224,7 @@ class OutgoingMail(object):
heloFallback=True,
requireAuthentication=False,
requireTransportSecurity=True)
- factory.domain = __version__
+ factory.domain = bytes('leap.mail-' + __version__)
emit_async(catalog.SMTP_SEND_MESSAGE_START,
self._from_address, recipient.dest.addrstr)
reactor.connectSSL(