diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 7578217995..fb43918ee7 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2286,14 +2286,18 @@ public class MessageHelper {
 
     static int getMessageCount(Folder folder) throws MessagingException {
         // Keep alive
-        folder.getMessageCount();
-
-        int count = 0;
-        for (Message message : folder.getMessages())
-            if (!message.isExpunged())
-                count++;
+        int total = folder.getMessageCount();
+        try {
+            int count = 0;
+            for (Message message : folder.getMessages())
+                if (!message.isExpunged())
+                    count++;
 
-        return count;
+            return count;
+        } catch (Throwable ex) {
+            Log.w(ex);
+            return total;
+        }
     }
 
     static String sanitizeKeyword(String keyword) {