diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java
index dd04b0df39..4cda4a5df7 100644
--- a/app/src/main/java/eu/faircode/email/DaoOperation.java
+++ b/app/src/main/java/eu/faircode/email/DaoOperation.java
@@ -51,8 +51,8 @@ public interface DaoOperation {
     @Query("SELECT * FROM operation ORDER BY id")
     List<EntityOperation> getOperations();
 
-    @Query("SELECT * FROM operation ORDER BY id LIMIT 1")
-    EntityOperation getOperationFirst();
+    @Query("SELECT * FROM operation WHERE error IS NOT NULL")
+    List<EntityOperation> getOperationsError();
 
     @Query("SELECT COUNT(id) FROM operation" +
             " WHERE folder = :folder" +
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 63acfcf771..f238340c5b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -211,7 +211,7 @@ public class FragmentMessages extends FragmentEx {
 
                             List<EntityFolder> folders = new ArrayList<>();
                             if (fid < 0)
-                                folders.addAll(db.folder().getUnifiedFolders());
+                                folders.addAll(db.folder().getFoldersSynchronizingUnified());
                             else
                                 folders.add(db.folder().getFolder(fid));