diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index da226e2c84..52540ac6b2 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -227,6 +227,7 @@ public interface DaoMessage {
             "  OR NOT EXISTS" +
             "   (SELECT * FROM message m" +
             "   WHERE m.id <> message.id" +
+            "   AND m.account = message.account" +
             "   AND m.thread = message.thread" +
             "   AND (m.hash = message.hash OR m.msgid = message.msgid)" +
             "   AND NOT m.ui_hide))" +