2 files changed, 8 insertions, 10 deletions
diff --git a/service/pixelated/support/date.py b/service/pixelated/support/date.py
index e7cdbb30..0012aeea 100644
--- a/service/pixelated/support/date.py
+++ b/service/pixelated/support/date.py
@@ -16,6 +16,7 @@
 import datetime
 
 import dateutil.parser
+from email.utils import formatdate
 from dateutil.tz import tzlocal
 
 
@@ -23,9 +24,6 @@ def iso_now():
     return datetime.datetime.now(tzlocal()).isoformat()
 
 
-def milliseconds(date):
-    date = dateutil.parser.parse(date)
-    date = date.replace(tzinfo=None)
-    epoch = datetime.datetime.utcfromtimestamp(0)
-    delta = date - epoch
-    return int(delta.total_seconds() * 1000)
+def mail_date_now():
+    date = dateutil.parser.parse(iso_now())
+    return formatdate(float(date.strftime('%s')))
diff --git a/service/pixelated/support/encrypted_file_storage.py b/service/pixelated/support/encrypted_file_storage.py
index 67036054..567a348a 100644
--- a/service/pixelated/support/encrypted_file_storage.py
+++ b/service/pixelated/support/encrypted_file_storage.py
@@ -23,7 +23,7 @@ from whoosh.filedb.filestore import FileStorage
 from whoosh.filedb.structfile import StructFile, BufferFile
 from leap.soledad.client.crypto import encrypt_sym
 from leap.soledad.client.crypto import decrypt_sym
-from leap.soledad.client.crypto import EncryptionMethods
+from leap.soledad.common.crypto import EncryptionMethods
 from whoosh.util import random_name
 
 
@@ -56,16 +56,16 @@ class EncryptedFileStorage(FileStorage):
         return hmac.new(self.signkey, verifiable_payload, sha256).digest()
 
     def encrypt(self, content):
-        iv, ciphertext = encrypt_sym(content, self.masterkey, EncryptionMethods.XSALSA20)
+        iv, ciphertext = encrypt_sym(content, self.masterkey)
         mac = self.gen_mac(iv, ciphertext)
         return ''.join((mac, iv, ciphertext))
 
     def decrypt(self, payload):
-        payload_mac, iv, ciphertext = payload[:32], payload[32:65], payload[65:]
+        payload_mac, iv, ciphertext = payload[:32], payload[32:57], payload[57:]
         generated_mac = self.gen_mac(iv, ciphertext)
         if sha256(payload_mac).digest() != sha256(generated_mac).digest():
             raise Exception("EncryptedFileStorage  - Error opening file. Wrong MAC")
-        return decrypt_sym(ciphertext, self.masterkey, EncryptionMethods.XSALSA20, iv=iv)
+        return decrypt_sym(ciphertext, self.masterkey, iv)
 
     def _encrypt_index_on_close(self, name):
         def wrapper(struct_file):