Disable encapsulation of spam and marking of it as seen

richard378 · Oct 28, 2014 · be9d979 · be9d979
1 parent 20c5471
commit be9d979
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/conf/sieve-spam.txt b/conf/sieve-spam.txt
@@ -1,7 +1,6 @@
 require ["regex", "fileinto", "imap4flags"];
 
 if allof (header :regex "X-Spam-Status" "^Yes") {
-  setflag "\\Seen";
   fileinto "Spam";
   stop;
 }

diff --git a/setup/spamassassin.sh b/setup/spamassassin.sh
@@ -50,6 +50,11 @@ tools/editconf.py /etc/spamassassin/local.cf -s \
 mkdir -p $STORAGE_ROOT/mail/spamassassin
 chown -R spampd:spampd $STORAGE_ROOT/mail/spamassassin
 
+# To simplify the correction of false-positives, we do not want to encapsulate
+# spam.
+tools/editconf.py /etc/spamassassin/local.cf -s \
+	report_safe=0
+
 # To mark mail as spam or ham, just drag it in or out of the Spam folder. We'll
 # use the Dovecot antispam plugin to detect the message move operation and execute
 # a shell script that invokes learning.