diff --git a/config/neomutt/keys.rc b/config/neomutt/keys.rc
index e1440ca..08da95d 100644
--- a/config/neomutt/keys.rc
+++ b/config/neomutt/keys.rc
@@ -27,12 +27,14 @@ bind index p recall-message
 bind index R group-reply
 bind index <tab> sync-mailbox
 bind index <space> collapse-thread
+bind index p recall-message
 
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
 
-# Saner copy/move dialogs
+# Saner copy/move/cd dialogs
 macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
 macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
+macro index c "<change-folder>?<toggle-mailboxes>" "move a message to a mailbox"
 
 #########
 # PAGER #
@@ -49,6 +51,8 @@ bind pager R group-reply
 bind pager gh   display-toggle-weed
 bind pager ge   extract-keys
 
+bind pager R	group-reply
+
 ##########
 # ATTACH #
 ##########
@@ -68,4 +72,15 @@ bind editor <Tab> complete-query
 bind editor ^T complete
 set query_format="%4c %t %-70.70a %-70.70n %?e?(%e)?"
 
+###########
+# COMPOSE #
+###########
+bind compose p postpone-message
+
+###########
+# Browser #
+###########
+bind browser l select-entry
+bind browser h goto-parent
+
 # vim: syntax=neomuttrc
diff --git a/config/neomutt/neomuttrc b/config/neomutt/neomuttrc
index c6f7371..b11771c 100644
--- a/config/neomutt/neomuttrc
+++ b/config/neomutt/neomuttrc
@@ -3,7 +3,7 @@ set mbox_type = Maildir
 set copy                # See also $record (f*ckin recursion)
 set folder = "~/mail"
 unmailboxes *
-mailboxes = `find ~/mail -mindepth 1 -type d ! -name cur ! -name tmp ! -name new -printf '"%p"\0' | xargs -0`
+mailboxes `find ~/mail -mindepth 1 -type d ! -name cur ! -name tmp ! -name new ! -name .notmuch -printf '"%p"\0' | xargs -0`
 
 # Load external configs
 source sidebar.rc
@@ -16,7 +16,6 @@ source '~/.config/neomutt/folder-hooks.sh|'
 
 # Basic options
 unset wait_key          # Only wait if command exited != 0
-set mail_check = 0      # minimum time between scans
 set delete              # delete messages for real
 unset confirmappend     # don't ask when adding to a mailbox
 set quit                #default; <quit> exits neomutt
@@ -26,6 +25,10 @@ set beep_new            # Hope your term bell is set to something sensible :P
 set pipe_decode         # decode and weed headers before <pipe-message>
 set thorough_search     #default; decode mail before searching ~b and ~h
 set sleep_time = 0      # Speed up folder opening
+set change_folder_next  # Default to next folder in list
+set mail_check = 5      #default; look for new mail every 'n' seconds
+set mail_check_stats    # Allow mail stats gathering
+set mail_check_stats_interval = 10  # Mail stats calc interval
 
 # Status bar
 set status_chars  = " *%A"  # mailbox unchanged/changed/RO/attach-msg mode
@@ -40,6 +43,7 @@ set sort = threads
 set sort_aux = last-date-received
 set uncollapse_jump                 # Jump to unread when unfolding
 set sort_re                         #default; useful for mailbox sort in sidebar
+unset narrow_tree                   #default; compact thread tree arrows
 
 #########
 # Pager #
@@ -85,7 +89,4 @@ set abort_noattach_regex = "\\<(attach(|ed|ments?)|(attaché|attachés|attache|a
 
 set editor = "vim -c 'set tw=70 et wrap' '+/^$' "
 
-###########
-# Browser #
-###########
 set mask = ".*" # Which files to match