diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index d15dc31889..e46b14600b 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -795,7 +795,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         }
 
         if (criteria.with_importance != null)
-            if (!Objects.equals(message.importance, criteria.with_importance))
+            if (!Objects.equals(message.importance, criteria.with_importance) &&
+                    !(EntityMessage.PRIORITIY_NORMAL.equals(criteria.with_importance) && message.importance == null))
                 return false;
 
         if (criteria.with_encrypted) {
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 1f1480c6b1..df776836d1 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -392,7 +392,7 @@ public interface DaoMessage {
             " AND (NOT :unseen OR NOT ui_seen)" +
             " AND (NOT :flagged OR ui_flagged)" +
             " AND (NOT :hidden OR NOT ui_snoozed IS NULL OR ui_unsnoozed)" +
-            " AND (:importance IS NULL OR importance = :importance)" +
+            " AND (:importance IS NULL OR importance = :importance OR (:importance = 1 AND importance IS NULL))" +
             " AND (NOT :encrypted OR ui_encrypt > 0)" +
             " AND (NOT :with_attachments OR attachments > 0)" +
             " AND (NOT :with_notes OR NOT `notes` IS NULL)" +