wip #6176

diff --git a/resources/emailconfig/spamassassin-rules.cf b/resources/emailconfig/spamassassin-rules.cf
index a3217c1218f17185d2e8f623c9854e110fd879b2..5f7efe5de31b096d554759abaacc6222efb7567c 100644 (file)
--- a/resources/emailconfig/spamassassin-rules.cf
+++ b/resources/emailconfig/spamassassin-rules.cf
@@ -17,7 +17,7 @@ score BAYES_70          1.1
 score BAYES_80          2.1
 score BAYES_95          3.1
 score BAYES_99          3.5
-score BAYES_999         10.5
+score BAYES_999         9.5
 
 # Workshop rules
 header X_FLUIDBOOK_SPAM                        exists:X-Fluidbook-SPAM
@@ -49,6 +49,9 @@ $spam_whitelist
 
 $spam_blacklist
 
+score NO_RELAYS     -100.0
+score USER_IN_WHITELIST -10.0
+
 # These are SpamAssassin rules aimed at detecting messages in Russian.
 # They are intended for users outside Russia who want to block any mail
 # in Russian.