diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 52d75dd315..3ed42afbea 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -8233,10 +8233,11 @@ public class FragmentMessages extends FragmentBase
                                 db.message().setMessageUiIgnored(message.id, true);
                         }
 
-                        if (account.protocol != EntityAccount.TYPE_IMAP || message.uid != null) {
-                            if (account.auto_seen)
+                        if (account.auto_seen)
+                            if (account.protocol != EntityAccount.TYPE_IMAP || message.uid != null)
                                 EntityOperation.queue(context, message, EntityOperation.SEEN, true);
-                        }
+                            else
+                                db.message().setMessageUiSeen(message.id, true);
                     }
 
                     if (account.protocol != EntityAccount.TYPE_IMAP || message.uid != null) {