diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index 8e5e826ff8..34dbeb38ad 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -42,7 +42,9 @@ public interface DaoFolder {
     @Query("SELECT * FROM folder WHERE synchronize")
     List<EntityFolder> getFoldersSynchronizing();
 
-    @Query("SELECT * FROM folder WHERE synchronize AND unified")
+    @Query("SELECT * FROM folder" +
+            " JOIN account ON account.id = folder.account" +
+            " WHERE account.synchronize AND folder.synchronize AND unified")
     List<EntityFolder> getFoldersSynchronizingUnified();
 
     @Query("SELECT * FROM folder" +