diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 47cb0f5fea..be1d93c344 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -779,7 +779,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         }
 
         if (criteria.with_hidden) {
-            if (message.ui_snoozed == null)
+            if (message.ui_snoozed == null && !message.ui_unsnoozed)
                 return false;
         }
 
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 7668bf5269..0c97ffe75f 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -385,7 +385,7 @@ public interface DaoMessage {
             " AND (:folder IS NULL OR folder = :folder)" +
             " AND (NOT :unseen OR NOT ui_seen)" +
             " AND (NOT :flagged OR ui_flagged)" +
-            " AND (NOT :hidden OR NOT ui_snoozed IS NULL)" +
+            " AND (NOT :hidden OR NOT ui_snoozed IS NULL OR ui_unsnoozed)" +
             " AND (NOT :encrypted OR ui_encrypt > 0)" +
             " AND (NOT :with_attachments OR attachments > 0)" +
             " AND (NOT :with_notes OR NOT `notes` IS NULL)" +