diff --git a/data/conf/dovecot/global_sieve_before b/data/conf/dovecot/global_sieve_before
index a71419d5..003fc27f 100644
--- a/data/conf/dovecot/global_sieve_before
+++ b/data/conf/dovecot/global_sieve_before
@@ -1,10 +1,10 @@
 # global_sieve_before script
 # global_sieve_before -> user sieve_before (mailcow UI) -> user sieve_after (mailcow UI) -> global_sieve_after
 
-require "fileinto";
-require "mailbox";
+require ["imap4flags", "mailbox", "fileinto"];
 
-if header :contains ["Chat-Version"] [""] {
+if allof(header :contains ["Chat-Version"] [""],
+  header :contains ["Auto-Submitted"] ["auto-replied"]) {
   if mailboxexists "DeltaChat" {
     fileinto "DeltaChat";
   } else {
@@ -12,3 +12,9 @@ if header :contains ["Chat-Version"] [""] {
   }
   stop;
 }
+
+if allof(header :contains ["Chat-Version"] [""],
+  header :contains ["Autocrypt"] [""]) {
+  setflag "\\seen";
+  stop;
+}