Fix: mailfilter: reorder and cleanup anti-spam rules

diff --git a/mailfilter.dot.link b/mailfilter.dot.link
index 68601752e243425967e2fb6534234e182bdbadc7..fe137f9bcb4d4eb11d790da462ca9a6cfe08e53b 100644 (file)
--- a/mailfilter.dot.link
+++ b/mailfilter.dot.link
@@ -45,16 +45,16 @@ if (/^X-Spam-Level: \*\*\*\*\*\*/)
 if (/^X-Spam-Flag: YES/)
   to $BASE/INBOX.Trash
 
-if (/^Subject:.*(SPAM)/)
-  to $BASE/INBOX.Trash
-
 if (/^X-Bogosity:.*Yes/)
   to $BASE/INBOX.Trash
 
-if (/^Subject:.*\*\*\*SPAM\*\*\*/)
+if (/^X-Bogosity: Spam.*/)
   to $BASE/INBOX.Trash
 
-if (/^X-Bogosity: Spam.*/)
+#if (/^Subject:.*\*\*\*SPAM\*\*\*/)
+#  to $BASE/INBOX.Trash
+
+if (/^Subject:.*(SPAM)/)
   to $BASE/INBOX.Trash
 
 #