diff --git a/config/dovecot/conf.d/90-sieve.conf b/config/dovecot/conf.d/90-sieve.conf
index 1ef77eb..736f0e0 100644
--- a/config/dovecot/conf.d/90-sieve.conf
+++ b/config/dovecot/conf.d/90-sieve.conf
@@ -80,7 +80,7 @@ plugin {
   # Identical to sieve_before, only the specified scripts are executed after the
   # user's script (only when keep is still in effect!). Multiple script
   # locations can be specified by appending an increasing number.
-  #sieve_after =
+  sieve_after = /etc/dovecot/sieve-after
   #sieve_after2 =
   #sieve_after2 = (etc...)
 
diff --git a/config/dovecot/sieve-after/spam-to-folder.sieve b/config/dovecot/sieve-after/spam-to-folder.sieve
new file mode 100644
index 0000000..fc8aec2
--- /dev/null
+++ b/config/dovecot/sieve-after/spam-to-folder.sieve
@@ -0,0 +1,6 @@
+require ["fileinto","mailbox"];
+
+if header :contains "X-Spam-Flag" "YES" {
+ fileinto :create "Junk";
+ stop;
+}
diff --git a/config/dovecot/sieve-after/spam-to-folder.svbin b/config/dovecot/sieve-after/spam-to-folder.svbin
new file mode 100644
index 0000000..a451671
Binary files /dev/null and b/config/dovecot/sieve-after/spam-to-folder.svbin differ
diff --git a/config/spamassassin/local.cf b/config/spamassassin/local.cf
index 0b77fa9..65872e9 100644
--- a/config/spamassassin/local.cf
+++ b/config/spamassassin/local.cf
@@ -9,13 +9,13 @@
 
 #   Add *****SPAM***** to the Subject header of spam e-mails
 #
-rewrite_header Subject *****SPAM*****
+#rewrite_header Subject *****SPAM*****
 
 
 #   Save spam messages as a message/rfc822 MIME attachment instead of
 #   modifying the original message (0: off, 2: use text/plain instead)
 #
-report_safe 1
+report_safe 0
 
 
 #   Set which networks or hosts are considered 'trusted' by your mail
@@ -41,21 +41,21 @@ use_bayes 1
 
 #   Bayesian classifier auto-learning (default: 1)
 #
- bayes_auto_learn 1
+bayes_auto_learn 1
 
 
 #   Set headers which may provide inappropriate cues to the Bayesian
 #   classifier
 #
-# bayes_ignore_header X-Bogosity
-# bayes_ignore_header X-Spam-Flag
-# bayes_ignore_header X-Spam-Status
+bayes_ignore_header X-Bogosity
+bayes_ignore_header X-Spam-Flag
+bayes_ignore_header X-Spam-Status
 
 
 #   Whether to decode non- UTF-8 and non-ASCII textual parts and recode
 #   them to UTF-8 before the text is given over to rules processing.
 #
-# normalize_charset 1
+normalize_charset 1
 
 #   Some shortcircuiting, if the plugin is enabled
 #