diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index e2a51f8a5b..919e19be52 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1254,9 +1254,6 @@ class Core {
                     itarget.close();
             }
 
-        if (EntityFolder.USER.equals(target.type))
-            db.folder().increaseSelectedCount(target.id, new Date().getTime());
-
         // Delete junk contacts
         if (EntityFolder.JUNK.equals(target.type))
             for (EntityMessage message : map.values()) {
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 777cbd2f4d..e3a43f52a6 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -239,6 +239,10 @@ public class EntityOperation {
                     EntityMessage.snooze(context, message.id, null);
                 }
 
+                if (source.account.equals(target.account) &&
+                        EntityFolder.USER.equals(target.type))
+                    db.folder().increaseSelectedCount(target.id, new Date().getTime());
+
                 if (EntityFolder.JUNK.equals(source.type) && EntityFolder.INBOX.equals(target.type)) {
                     List<EntityRule> rules = db.rule().getRules(target.id);
                     for (EntityRule rule : rules)