diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 26d9519060..81b8bc85e2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4256,7 +4256,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 }
 
                 for (MessageTarget target : mt)
-                    if (!target.across && target.folder.id == folder)
+                    if (!target.across && target.folder.id == folder &&
+                            (removed == null || !removed.contains(target.id)))
                         count++;
 
                 Log.i("Auto close=" + count);