diff --git a/symlinks/config/mutt/keymaps.muttrc b/symlinks/config/mutt/keymaps.muttrc
new file mode 100644
index 0000000..79fbe79
--- /dev/null
+++ b/symlinks/config/mutt/keymaps.muttrc
@@ -0,0 +1,15 @@
+macro index,pager A "<save-message>=Archive<enter>" "Archive Message"
+
+macro index,pager <f2> '<sync-mailbox><enter-command>source ~/.config/mutt/accounts/gmail<enter><change-folder>!<enter>'
+macro index,pager <f3> '<sync-mailbox><enter-command>source ~/.config/mutt/accounts/ensarsarajcic<enter><change-folder>!<enter>'
+
+bind index,pager - sidebar-toggle-visible
+bind index,pager \Cj sidebar-next
+bind index,pager \Ck sidebar-prev
+bind index,pager \Co sidebar-open
+bind index,pager \Cp sidebar-prev-new
+bind index,pager \Cn sidebar-next-new
+
+bind editor <Tab> complete-query
+
+# vim: filetype=neomuttrc
diff --git a/symlinks/config/mutt/muttrc b/symlinks/config/mutt/muttrc
index f72d7f0..b9cc754 100644
--- a/symlinks/config/mutt/muttrc
+++ b/symlinks/config/mutt/muttrc
@@ -23,12 +23,14 @@ alternative_order text/plain text/enriched text/html
 auto_view text/html
 # Order to try and show multipart emails
 alternative_order text/plain text/enriched text/html
-set editor = "vim"
+set editor = "nvim"
 
-source accounts/gmail
+set text_flowed=yes
+
+source ~/.config/mutt/accounts/gmail
 folder-hook $folder 'source ~/.config/mutt/accounts/gmail'
 
-source accounts/ensarsarajcic
+source ~/.config/mutt/accounts/ensarsarajcic
 folder-hook $folder 'source ~/.config/mutt/accounts/ensarsarajcic'
 
 # Mailbox type
@@ -40,8 +42,4 @@ set imap_check_subscribed
 
 source /usr/share/doc/neomutt/vim-keys/vim-keys.rc
 source colors-gruvbox.muttrc
-
-macro index,pager A "<save-message>=Archive<enter>" "Archive Message"
-
-macro index,pager <f2> '<sync-mailbox><enter-command>source ~/.config/mutt/accounts/gmail<enter><change-folder>!<enter>'
-macro index,pager <f3> '<sync-mailbox><enter-command>source ~/.config/mutt/accounts/ensarsarajcic<enter><change-folder>!<enter>'
+source keymaps.muttrc