diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 2f462ded..ac6c7d81 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -624,10 +624,15 @@ public class FragmentMessages extends FragmentEx {
                                             db.beginTransaction();
 
                                             for (long id : ids) {
-                                                db.message().setMessageUiHide(id, true);
-
                                                 EntityMessage message = db.message().getMessage(id);
-                                                EntityOperation.queue(db, message, EntityOperation.MOVE, target);
+                                                List<EntityMessage> messages =
+                                                        db.message().getMessageByThread(message.account, message.thread);
+                                                for (EntityMessage threaded : messages) {
+                                                    if (threaded.folder.equals(message.folder)) {
+                                                        db.message().setMessageUiHide(threaded.id, true);
+                                                        EntityOperation.queue(db, threaded, EntityOperation.MOVE, target);
+                                                    }
+                                                }
                                             }
 
                                             db.setTransactionSuccessful();