diff --git a/mail/.config/neomutt/div_np b/mail/.config/neomutt/div_np
new file mode 100644
index 0000000..e69de29
diff --git a/mail/.config/neomutt/div_rw b/mail/.config/neomutt/div_rw
new file mode 100644
index 0000000..e69de29
diff --git a/mail/.config/neomutt/layout b/mail/.config/neomutt/layout
index 609331b..985b32c 100644
--- a/mail/.config/neomutt/layout
+++ b/mail/.config/neomutt/layout
@@ -1,8 +1,10 @@
 # sidebar
 set sidebar_visible                           # show sidebar
 set sidebar_divider_char = "│"                # divider between sidebar + index
-set sidebar_width = 22                        # sidebar width
+set sidebar_width = 25                        # sidebar width
 set sidebar_format = "%B%?F? [%F]?%* %?N?%N?" # display folder name + unread count
+set sidebar_short_path = yes                  # truncate folder name
+set mail_check_stats                          # calculate message counts
 
 # status bar
 set status_chars  = " *%A"
diff --git a/mail/.config/neomutt/mailboxes b/mail/.config/neomutt/mailboxes
index 673f334..f08cdb2 100644
--- a/mail/.config/neomutt/mailboxes
+++ b/mail/.config/neomutt/mailboxes
@@ -1,3 +1,6 @@
-source 'find ~/.mail -name cur -printf "mailboxes \"%h\"\n"|sort|'
+named-mailboxes ":: rawlinson" ~/.config/neomutt/div_rw
+mailboxes `find ~/.mail/rawlinson -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '`
+named-mailboxes ":: nullpointer" ~/.config/neomutt/div_np
+mailboxes `find ~/.mail/nullpointer -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '`
 
 # vim: syntax=muttrc
diff --git a/mail/.config/neomutt/notmuch b/mail/.config/neomutt/notmuch
index f985605..caab3de 100644
--- a/mail/.config/neomutt/notmuch
+++ b/mail/.config/neomutt/notmuch
@@ -73,10 +73,10 @@ bind index,pager E sidebar-toggle-virtual
 # virtual-mailboxes description notmuch-URI { description notmuch-URI ...}
 # virtual-mailboxes "Climbing" "notmuch://?query=climbing"
 
-virtual-mailboxes                              \
-    "INBOX"     "notmuch://?query=tag:INBOX"   \
-    "Unread"    "notmuch://?query=tag:unread"  \
-    "Sent"      "notmuch://?query=tag:sent"        # sets up queries for virtual folders
+#virtual-mailboxes                              \
+#    "INBOX"     "notmuch://?query=tag:INBOX"   \
+#    "Unread"    "notmuch://?query=tag:unread"  \
+#    "Sent"      "notmuch://?query=tag:sent"        # sets up queries for virtual folders
 
 # Replace some tags with icons
 # tag-transforms tag transformed-string { tag transformed-string ...}