From d383c0ab9bcc82a11e997063b023029e9caf5d4b Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Fri, 13 Aug 2021 06:18:43 +0200
Subject: [PATCH] [Dovecot] Revert autocrypt sieve before, fixes DeltaChat and
 closes #4230

---
 data/conf/dovecot/global_sieve_before | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

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