diff --git a/roles/neomutt/templates/neomuttrc.j2 b/roles/neomutt/templates/neomuttrc.j2
index e25990b..1be5ebd 100644
--- a/roles/neomutt/templates/neomuttrc.j2
+++ b/roles/neomutt/templates/neomuttrc.j2
@@ -24,15 +24,9 @@ auto_view text/html             # automatically show html (mailcap uses lynx)
 auto_view application/pgp-encrypted
 alternative_order text/plain text/enriched text/html
 
+# General rebindings
 bind index,pager i noop
 bind index,pager g noop
-bind index,pager x noop
-bind index,pager N noop
-#bind index \Cf noop
-#bind index,pager M noop
-#bind index,pager C noop
-
-# General rebindings
 bind index gg first-entry
 bind pager gg top
 bind browser gg top-page
@@ -52,17 +46,21 @@ bind pager l view-attachments
 bind attach l view-mailcap
 bind attach <return> view-mailcap
 bind browser l select-entry
+bind index,pager x noop
 macro index x ":set confirmappend=no delete=yes resolve=no\n<clear-flag>N<tag-prefix><delete-message>:set confirmappend=yes delete=ask-yes resolve=yes\n<next-undeleted>" "read and delete message"
 bind index U undelete-message
 bind editor <space> noop
-#bind index L limit
 bind index,query <space> tag-entry
+#bind index L limit
 #bind index,pager H view-raw-message
+bind index,pager N noop
 bind index,pager N search-opposite
 bind index,pager S sync-mailbox
 bind index,pager R group-reply
 bind editor <Tab> complete-query
 
+#bind index,pager M noop
+#bind index,pager C noop
 #macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
 #macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
 #macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
@@ -86,6 +84,7 @@ macro index,attach,pager \Cb <pipe-entry>'urlscan'<enter> "follow links with url
 #macro index,pager a "<enter-command>set my_pipe_decode=\$pipe_decode pipe_decode<return><pipe-message>abook --add-email<return><enter-command>set pipe_decode=\$my_pipe_decode; unset my_pipe_decode<return>" "add the sender address to abook"
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
 #macro index O "<shell-escape>mw -Y<enter>" "run mw -Y to sync all mail"
+#bind index \Cf noop
 #macro index \Cf "<enter-command>unset wait_key<enter><shell-escape>printf 'Enter a search term to find with notmuch: '; read x; echo \$x >~/.cache/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"<enter>" "show only messages matching a notmuch pattern"
 #macro index A "<limit>all\n" "show all messages (undo limit)"