diff --git a/roles/mail/templates/mailfilters/cddmail2.j2 b/roles/mail/templates/mailfilters/cddmail2.j2
index 5e24033..a6b9cb7 100644
--- a/roles/mail/templates/mailfilters/cddmail2.j2
+++ b/roles/mail/templates/mailfilters/cddmail2.j2
@@ -6,11 +6,16 @@ MAILDIR="$HOME/users/lukas" # default Maildir
 
 if ( $MAILDIR =~ /\/lukas$/ )
 {
-  # deliver GitHub notifications to the Kirby folders
+  # deliver Nolt and 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)
+  {
+    MAILDIR="$MAILDIR/.Kirby3"
+  }
+
   if( /^List-Archive: https:\/\/github.com\/getkirby-v2\//:h )
   {
     MAILDIR="$MAILDIR/.Kirby2"