Merge branch 'kali/feature/return-deferred' into develop

3 files changed, 9 insertions, 13 deletions

diff --git a/README.rst b/README.rst
index f758a66..df75218 100644
--- a/README.rst
+++ b/README.rst
@@ -11,17 +11,11 @@ More info: https://leap.se
 running tests
 -------------
 
-Use trial to run the test suite.
-
-```
-trial leap.mail
-```
+Use trial to run the test suite::
+  trial leap.mail
 
 ... and all its goodies. To run all imap tests in a loop until some of them
-fails:
-
-```
-trial -u leap.mail.imap
-```
+fails::
+  trial -u leap.mail.imap
 
 Read the *trial* manpage for more options .
diff --git a/src/leap/mail/imap/mailbox.py b/src/leap/mail/imap/mailbox.py
index aa2a300..34cf535 100644
--- a/src/leap/mail/imap/mailbox.py
+++ b/src/leap/mail/imap/mailbox.py
@@ -459,6 +459,8 @@ class SoledadMailbox(WithMsgFields, MBoxParser):
                                  notify_on_disk=notify_on_disk)
         if PROFILE_CMD:
             do_profile_cmd(d, "APPEND")
+
+        # XXX should review now that we're not using qtreactor.
         # A better place for this would be  the COPY/APPEND dispatcher
         # in server.py, but qtreactor hangs when I do that, so this seems
         # to work fine for now.
diff --git a/src/leap/mail/smtp/gateway.py b/src/leap/mail/smtp/gateway.py
index ef398d1..13d3bbf 100644
--- a/src/leap/mail/smtp/gateway.py
+++ b/src/leap/mail/smtp/gateway.py
@@ -463,13 +463,13 @@ class EncryptedMessage(object):
         """
         Sends the message.
 
-        :return: A deferred with callbacks for error and success of this
-                 #message send.
+        :return: A deferred with callback and errback for
+                 this #message send.
         :rtype: twisted.internet.defer.Deferred
         """
         d = deferToThread(self._route_msg)
         d.addCallbacks(self.sendQueued, self.sendError)
-        return
+        return d
 
     def _route_msg(self):
         """