diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java
index 720a019224..95bc0084a3 100644
--- a/app/src/main/java/eu/faircode/email/DaoOperation.java
+++ b/app/src/main/java/eu/faircode/email/DaoOperation.java
@@ -42,7 +42,7 @@ public interface DaoOperation {
             " FROM operation" +
             " JOIN folder ON folder.id = operation.folder" +
             " LEFT JOIN message ON message.id = operation.message" +
-            " LEFT JOIN account ON account.id = operation.account OR account.id = folder.account" +
+            " LEFT JOIN account ON account.id = operation.account" +
             " LEFT JOIN identity ON identity.id = message.identity" +
             " ORDER BY " + priority + ", id")
     LiveData<List<TupleOperationEx>> liveOperations();