diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index aafb4b8849..91dffb88d2 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -179,14 +179,11 @@ public interface DaoFolder {
 
     @Query("SELECT folder.* FROM folder" +
             " JOIN account ON account.id = folder.account" +
-            " WHERE `primary` AND type = '" + EntityFolder.DRAFTS + "'")
+            " WHERE account.synchronize" +
+            " AND account.`primary`" +
+            " AND type = '" + EntityFolder.DRAFTS + "'")
     EntityFolder getPrimaryDrafts();
 
-    @Query("SELECT folder.* FROM folder" +
-            " JOIN account ON account.id = folder.account" +
-            " WHERE `primary` AND type = '" + EntityFolder.ARCHIVE + "'")
-    EntityFolder getPrimaryArchive();
-
     @Query("SELECT * FROM folder WHERE type = '" + EntityFolder.OUTBOX + "'")
     EntityFolder getOutbox();