diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 0614d1f874..7dfea4bcc9 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -506,6 +506,7 @@ public interface DaoMessage {
             "  OR message.received > account.created" +
             "  OR message.sent > account.created" +
             "  OR message.ui_unsnoozed)" +
+            " AND (uid IS NOT NULL OR account.pop <> " + EntityAccount.TYPE_IMAP + ")" +
             " AND message.notifying <> " + EntityMessage.NOTIFYING_IGNORE +
             " AND (message.notifying <> 0 OR NOT (message.ui_seen OR message.ui_ignored OR message.ui_hide))" +
             " ORDER BY message.received DESC")