diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index a77471b785..2d5021a1f5 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -157,11 +157,14 @@ public class EntityOperation {
                         " target=" + target.id + ":" + target.name +
                         " auto read=" + autoread + " flag=" + autounflag);
 
-                if (autoread)
-                    db.message().setMessageUiSeen(message.id, true);
+                if (autoread || autounflag)
+                    for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid)) {
+                        if (autoread)
+                            db.message().setMessageUiSeen(similar.id, true);
+                        if (autounflag)
+                            db.message().setMessageUiFlagged(similar.id, false, null);
+                    }
 
-                if (autounflag)
-                    db.message().setMessageUiFlagged(message.id, false, null);
 
                 if (!EntityFolder.ARCHIVE.equals(source.type) ||
                         EntityFolder.TRASH.equals(target.type) || EntityFolder.JUNK.equals(target.type))
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 21741c0923..eb6da39a41 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2325,7 +2325,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             return;
 
                         int unseen = stats.count - stats.seen;
-                        setSubtitle(getString(R.string.title_name_count, stats.accountName, NF.format(unseen)));
+                        if (unseen == 0)
+                            setSubtitle(stats.accountName);
+                        else
+                            setSubtitle(getString(R.string.title_name_count, stats.accountName, NF.format(unseen)));
                     }
                 });
                 db.message().liveHiddenThread(account, thread).observe(getViewLifecycleOwner(), new Observer<List<Long>>() {