From b4d2f79709a252aa1ac2a74ff09b15071de5cabd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 13 Aug 2020 09:38:25 +0200
Subject: [PATCH] Added message count fallback

---
 .../java/eu/faircode/email/MessageHelper.java  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

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) {