diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 1100413748..f37841e5d8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1812,10 +1812,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     List<EntityMessage> messages = db.message().getMessagesByThread(
                             message.account, message.thread, threading ? null : id, null);
                     for (EntityMessage threaded : messages) {
-                        if (threaded.ui_seen)
-                            result.seen = true;
-                        else
-                            result.unseen = true;
+                        if (threaded.folder.equals(message.folder))
+                            if (threaded.ui_seen)
+                                result.seen = true;
+                            else
+                                result.unseen = true;
 
                         if (threaded.ui_flagged)
                             result.flagged = true;