Fixed test_mailboxes.py test.

2 files changed, 7 insertions, 8 deletions

diff --git a/service/pixelated/adapter/mailstore/leap_mailstore.py b/service/pixelated/adapter/mailstore/leap_mailstore.py
index 87bfea04..7bcd8a6a 100644
--- a/service/pixelated/adapter/mailstore/leap_mailstore.py
+++ b/service/pixelated/adapter/mailstore/leap_mailstore.py
@@ -23,9 +23,9 @@ from pixelated.adapter.model.mail import Mail
 
 class LeapMail(Mail):
 
-    def __init__(self, mail_id, headers, tags=set(), body=None):
+    def __init__(self, mail_id, headers=None, tags=set(), body=None):
         self._mail_id = mail_id
-        self.headers = headers
+        self.headers = headers if headers is not None else {}
         self._body = body
         self.tags = tags
 
diff --git a/service/pixelated/adapter/services/mailboxes.py b/service/pixelated/adapter/services/mailboxes.py
index 52c9c212..ce54055a 100644
--- a/service/pixelated/adapter/services/mailboxes.py
+++ b/service/pixelated/adapter/services/mailboxes.py
@@ -78,14 +78,13 @@ class Mailboxes(object):
         return self._move_to(mail_id, self.trash)
 
     def move_to_inbox(self, mail_id):
-        return self._move_to(mail_id, self.inbox)
+        # return self._move_to(mail_id, self.inbox)
+        return self._move_to(mail_id, 'INBOX')
 
     @defer.inlineCallbacks
-    def _move_to(self, mail_id, mailbox):
-        mailbox = yield mailbox
-        mail = yield self.querier.mail(mail_id)
-        mail.set_mailbox(mailbox.mailbox_name)
-        mail.save()
+    def _move_to(self, mail_id, mailbox_name):
+        yield self.mail_store.add_mailbox(mailbox_name)
+        mail = yield self.mail_store.move_mail_to_mailbox(mail_id, mailbox_name)
         defer.returnValue(mail)
 
     def mail(self, mail_id):