diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d152edf8dc..aea3593861 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1532,7 +1532,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                     EntityMessage message = db.message().getMessage(id);
                                     if (message != null) {
                                         List<EntityMessage> messages = db.message().getMessagesByThread(
-                                                message.account, message.thread, threading ? null : id, null);
+                                                message.account, message.thread, threading ? null : id, message.ui_seen ? message.folder : null);
                                         for (EntityMessage threaded : messages)
                                             if (threaded.ui_seen == message.ui_seen)
                                                 EntityOperation.queue(context, threaded, EntityOperation.SEEN, !message.ui_seen);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index a9694a4a81..6b4a373a16 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1808,7 +1808,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                         EntityMessage message = db.message().getMessage(id);
                         if (message != null) {
                             List<EntityMessage> messages = db.message().getMessagesByThread(
-                                    message.account, message.thread, threading ? null : id, null);
+                                    message.account, message.thread, threading ? null : id, seen ? null : message.folder);
                             for (EntityMessage threaded : messages)
                                 if (threaded.ui_seen != seen)
                                     EntityOperation.queue(context, threaded, EntityOperation.SEEN, seen);