X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/873ad5c3ec93f8789e6e1c4696f3b140fc128689..a9f9f1f2676165296aec089a6181bb8cfddc5131:/procmail/procmailrc

diff --git a/procmail/procmailrc b/procmail/procmailrc
index b72cc4e..6dcd3b4 100755
--- a/procmail/procmailrc
+++ b/procmail/procmailrc
@@ -17,7 +17,9 @@ INCLUDERC=$PMDIR/smsmail
 #VERBOSE=yes
 
 INCLUDERC=$PMDIR/logging
-INCLUDERC=$PMDIR/msgid-index
+#INCLUDERC=$PMDIR/msgid-index
+
+INCLUDERC=$PMDIR/flag-test-messages
 
 INCLUDERC=$PMDIR/dejavu
 INCLUDERC=$PMDIR/cleanup
@@ -29,22 +31,25 @@ INCLUDERC=$PMDIR/to-gmail
 
 INCLUDERC=$PMDIR/justme
 
-INCLUDERC=$PMDIR/spamtraps
-INCLUDERC=$PMDIR/spammers
 INCLUDERC=$PMDIR/spamfilter
 
-INCLUDERC=$PMDIR/addheaders
-
 INCLUDERC=$PMDIR/handlespam
 
 #INCLUDERC=$PMDIR/autoreplies
+
 INCLUDERC=$PMDIR/tickle
 
+INCLUDERC=$PMDIR/listquirks
+
+INCLUDERC=$PMRULES/all
+
+INCLUDERC=$PMDIR/addheaders
+
 #INCLUDERC=$PMDIR/lurker
 INCLUDERC=$PMDIR/spool
 
-INCLUDERC=$PMDIR/listquirks
+#TODO: only spool after delayed delivery
 
-INCLUDERC=$PMRULES/all
+INCLUDERC=$PMDIR/delay-delivery
 
-INCLUDERC=$PMDIR/deliver
+SWITCHRC=$PMDIR/deliver