diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index a21d210e49..1103fce4f9 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1014,6 +1014,9 @@ class Core {
             } catch (MessageRemovedException ignored) {
             }
             ifolder.expunge();
+        } else {
+            int count = ifolder.getMessageCount();
+            db.folder().setFolderTotal(folder.id, count < 0 ? null : count);
         }
 
         // Fetch appended/copied when needed