Merge tag '0.4.1'

Tag version 0.4.1

1 files changed, 9 insertions, 9 deletions

diff --git a/src/leap/mail/adaptors/soledad.py b/src/leap/mail/adaptors/soledad.py
index 8de83f7..f4af020 100644
--- a/src/leap/mail/adaptors/soledad.py
+++ b/src/leap/mail/adaptors/soledad.py
@@ -22,7 +22,6 @@ import re
 from collections import defaultdict
 from email import message_from_string
 
-from pycryptopp.hash import sha256
 from twisted.internet import defer
 from twisted.python import log
 from zope.interface import implements
@@ -687,13 +686,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
@@ -1207,7 +1207,7 @@ def _split_into_parts(raw):
 def _parse_msg(raw):
     msg = message_from_string(raw)
     parts = walk.get_parts(msg)
-    chash = sha256.SHA256(raw).hexdigest()
+    chash = walk.get_hash(raw)
     multi = msg.is_multipart()
     return msg, parts, chash, multi