1 files changed, 12 insertions, 7 deletions
diff --git a/service/pixelated/adapter/soledad/soledad_duplicate_removal_mixin.py b/service/pixelated/adapter/soledad/soledad_duplicate_removal_mixin.py
index 0dd3d497..a2b4b6d7 100644
--- a/service/pixelated/adapter/soledad/soledad_duplicate_removal_mixin.py
+++ b/service/pixelated/adapter/soledad/soledad_duplicate_removal_mixin.py
@@ -14,28 +14,33 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 from pixelated.adapter.soledad.soledad_facade_mixin import SoledadDbFacadeMixin
+from twisted.internet import defer
 
 
 class SoledadDuplicateRemovalMixin(SoledadDbFacadeMixin, object):
 
+    @defer.inlineCallbacks
     def remove_duplicates(self):
         for mailbox in ['INBOX', 'DRAFTS', 'SENT', 'TRASH']:
-            self._remove_dup_inboxes(mailbox)
-            self._remove_dup_recent(mailbox)
+            yield self._remove_dup_inboxes(mailbox)
+            yield self._remove_dup_recent(mailbox)
 
+    @defer.inlineCallbacks
     def _remove_many(self, docs):
-        [self.delete_doc(doc) for doc in docs]
+        [(yield self.delete_doc(doc)) for doc in docs]
 
+    @defer.inlineCallbacks
     def _remove_dup_inboxes(self, mailbox_name):
-        mailboxes = self.get_mbox(mailbox_name)
+        mailboxes = yield self.get_mbox(mailbox_name)
         if len(mailboxes) == 0:
             return
         mailboxes_to_remove = sorted(mailboxes, key=lambda x: x.content['created'])[1:len(mailboxes)]
-        self._remove_many(mailboxes_to_remove)
+        yield self._remove_many(mailboxes_to_remove)
 
+    @defer.inlineCallbacks
     def _remove_dup_recent(self, mailbox_name):
-        rct = self.get_recent_by_mbox(mailbox_name)
+        rct = yield self.get_recent_by_mbox(mailbox_name)
         if len(rct) == 0:
             return
         rct_to_remove = sorted(rct, key=lambda x: len(x.content['rct']), reverse=True)[1:len(rct)]
-        self._remove_many(rct_to_remove)
+        yield self._remove_many(rct_to_remove)