diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b56c5ee0c3..3797bd93f3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2623,7 +2623,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             EntityOperation.queue(context, message, EntityOperation.FLAG, flagged);
                         else {
                             List<EntityMessage> messages = db.message().getMessagesByThread(
-                                    message.account, message.thread, threading && thread ? null : id, message.folder);
+                                    message.account, message.thread, threading && thread ? null : id, flagged ? message.folder : null);
                             for (EntityMessage threaded : messages)
                                 EntityOperation.queue(context, threaded, EntityOperation.FLAG, flagged);
                         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index a61a7e9051..c6faa035a3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2388,7 +2388,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             continue;
 
                         List<EntityMessage> messages = db.message().getMessagesByThread(
-                                message.account, message.thread, threading ? null : id, message.folder);
+                                message.account, message.thread, threading ? null : id, flagged ? message.folder : null);
                         for (EntityMessage threaded : messages)
                             if (threaded.ui_flagged != flagged || !Objects.equals(threaded.color, color))
                                 EntityOperation.queue(context, threaded, EntityOperation.FLAG, flagged, color);
diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index 9e58de102e..f8a98fc519 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -313,7 +313,7 @@ public class ServiceUI extends IntentService {
                 return;
 
             List<EntityMessage> messages = db.message().getMessagesByThread(
-                    message.account, message.thread, threading ? null : id, null);
+                    message.account, message.thread, threading ? null : id, message.folder);
             for (EntityMessage threaded : messages) {
                 EntityOperation.queue(this, threaded, EntityOperation.FLAG, true);
                 EntityOperation.queue(this, threaded, EntityOperation.SEEN, true);