From be9d97902f4f1911f814dc2692b0ab40d0da6c62 Mon Sep 17 00:00:00 2001
From: David Piggott <david@piggott.me.uk>
Date: Sun, 19 Oct 2014 16:32:31 +0100
Subject: [PATCH] Disable encapsulation of spam and marking of it as seen

---
 conf/sieve-spam.txt   | 1 -
 setup/spamassassin.sh | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/conf/sieve-spam.txt b/conf/sieve-spam.txt
index 6f364fea..bf6bdcef 100644
--- 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
index 92b46fca..de21f9eb 100755
--- 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.