diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 81f6786201..b1d5192216 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -547,7 +547,7 @@ public class EntityRule {
 
         // Prevent loop
         List<EntityMessage> messages = db.message().getMessagesByThread(
-                message.account, message.thread, null, message.folder);
+                message.account, message.thread, null, null);
         for (EntityMessage threaded : messages) {
             EntityLog.log(context, "Answer loop check" +
                     " message=" + MessageHelper.formatAddresses(threaded.from) +