diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 261ee222a2..e7170d62b0 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -218,6 +218,7 @@ public interface DaoMessage {
             " AND message.thread = :thread" +
             " AND (:id IS NULL OR message.id = :id)" +
             " AND (NOT :filter_archive" +
+            "  OR (NOT message.ui_seen AND NOT message.ui_hide)" +
             "  OR folder.type <> '" + EntityFolder.ARCHIVE + "'" +
             "  OR NOT EXISTS" +
             "   (SELECT * FROM message m" +