diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 6b04dcfd21..c2efd098af 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -158,7 +158,8 @@ public class MessageHelper {
             "$attachment", // Kmail
             "$signed", // Kmail
             "$encrypted", // Kmail
-            "$HasNoAttachment",
+            "$HasAttachment", // Dovecot
+            "$HasNoAttachment", // Dovecot
             "$Classified" // FairEmail
     ));