roles/mail/templates/mailfilters/_common.j2

@@ -26,7 +26,7 @@ if ( $EXT )
 }
 
 # check if the spam score is higher than our threshold
-if ( /^X-Rspamd-Bar: \+{$MOVESCORE,}$/:h )
+if ( /^X-Rspamd-Bar: \+{$MOVESCORE,}$/ )
 {
   # yes, move to Spam folder and exit
 

roles/mail/templates/mailfilters/cddmail2.j2

@@ -6,22 +6,17 @@ MAILDIR="$HOME/users/lukas" # default Maildir
 
 if ( $MAILDIR =~ /\/lukas$/ )
 {
-  # deliver Nolt and GitHub notifications to the Kirby folders
+  # deliver GitHub notifications to the Kirby folders
 
   `test -d "$MAILDIR/.Kirby2"; or maildirmake "$MAILDIR/.Kirby2"`
   `test -d "$MAILDIR/.Kirby3"; or maildirmake "$MAILDIR/.Kirby3"`
 
-  if( /^From: .*? <notifications@nolt\.io>$/:h)
+  if( /^List-Archive: https:\/\/github.com\/getkirby-v2\// )
-  {
-    MAILDIR="$MAILDIR/.Kirby3"
-  }
-
-  if( /^List-Archive: https:\/\/github.com\/getkirby-v2\//:h )
   {
     MAILDIR="$MAILDIR/.Kirby2"
   }
 
-  if( /^List-Archive: https:\/\/github.com\/getkirby\//:h )
+  if( /^List-Archive: https:\/\/github.com\/getkirby\// )
   {
     MAILDIR="$MAILDIR/.Kirby3"
   }