Fixed the get_body logic

It won't break anymore if the body is None, but will
return an empty body in that case

1 files changed, 8 insertions, 7 deletions

diff --git a/mail/src/leap/mail/adaptors/soledad.py b/mail/src/leap/mail/adaptors/soledad.py
index 8de83f7..7f2b1cf 100644
--- a/mail/src/leap/mail/adaptors/soledad.py
+++ b/mail/src/leap/mail/adaptors/soledad.py
@@ -687,13 +687,14 @@ class MessageWrapper(object):
         :rtype: deferred
         """
         body_phash = self.hdoc.body
-        if not body_phash:
-            if self.cdocs:
-                return self.cdocs[1]
-        d = store.get_doc('C-' + body_phash)
-        d.addCallback(lambda doc: ContentDocWrapper(**doc.content))
-        return d
-
+        if body_phash:
+            d = store.get_doc('C-' + body_phash)
+            d.addCallback(lambda doc: ContentDocWrapper(**doc.content))
+            return d
+        elif self.cdocs:
+            return self.cdocs[1]
+        else:
+            return ''
 
 #
 # Mailboxes