diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index fd76b09f9a..57f892a1a2 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -652,9 +652,9 @@ public interface DaoMessage {
 
     @Query("SELECT uid FROM message" +
             " WHERE folder = :folder" +
-            " AND NOT ui_busy IS NULL" +
-            " AND ui_busy > :time" +
-            " AND NOT uid IS NULL")
+            " AND NOT uid IS NULL" +
+            " AND ((NOT ui_busy IS NULL AND ui_busy > :time)" +
+            " OR (EXISTS (SELECT * FROM operation WHERE operation.id = message.id)))")
     List<Long> getBusyUids(long folder, long time);
 
     @Query("SELECT id, uidl, msgid, ui_hide, ui_busy, ui_flagged FROM message" +