3 files changed, 5 insertions, 3 deletions

diff --git a/mutt/default b/mutt/default
index 6de9eda..d233687 100644
--- a/mutt/default
+++ b/mutt/default
@@ -1,5 +1,5 @@
 # Edit rc file and source it. This is the most important thing
-macro index \cv ":set wait_key=no<Return>!vim ~/.config/mutt/muttrc<Return>:source ~/.config/mutt/muttrc<Return>:set wait_key=yes<Return>"
+macro index \cv "!vim ~/.config/mutt/muttrc<Return>:source ~/.config/mutt/muttrc<Return>"
 
 # Connection options
 set ssl_force_tls = yes
@@ -50,6 +50,8 @@ auto_view text/html
 macro pager h "v/html<return>xq<return>" "Open html file"
 
 # Vim-style key binding, \c means Ctrl
+macro index c '<change-folder>+'
+macro index q '<change-folder>?'
 bind index o sort-reverse
 bind index O sort-mailbox
 bind index E edit-type
@@ -86,7 +88,6 @@ macro index d '<tag-prefix><delete-message>' 'Delete'
 macro index s '<tag-prefix><save-message>' 'Saved'
 macro index W '<tag-prefix><clear-flag>' 'Clear flag'
 macro index w '<tag-prefix><set-flag>' 'Set flag'
-macro index q 'c?'
 macro pager x ':set my_keep_lines1 = $my_keep_lines2<enter>:set my_keep_lines2 = $pager_index_lines<enter>:set pager_index_lines = $my_keep_lines1<enter>'
 macro pager U "\
 :set my_tmp_pipe_decode=\$pipe_decode\n\
diff --git a/mutt/mailcap b/mutt/mailcap
index ab0c00c..e8760ee 100644
--- a/mutt/mailcap
+++ b/mutt/mailcap
@@ -1,4 +1,4 @@
-text/html; firefox '%s' &; test=test -n "$DISPLAY"; needsterminal;
+text/html; firefox '%s' &>/dev/null &; test=test -n "$DISPLAY"; needsterminal;
 text/html; w3m -I %{charset} -T text/html; copiousoutput;
 text/plain; less -N %s; copiousoutput;
 application/json; jq . %s | less -N; copiousoutput;
diff --git a/mutt/muttrc.topo b/mutt/muttrc.topo
index 69c5bbf..55dab55 100644
--- a/mutt/muttrc.topo
+++ b/mutt/muttrc.topo
@@ -67,3 +67,4 @@ macro index,pager           gd      "<change-folder>+DeltaChat<Return>" "Switch
 macro index,pager           gD      "<change-folder>+Drafts<Return>" "Switch to Drafts folder"
 macro index,pager           gt      "<change-folder>+Trash<Return>" "Switch to Trash folder"
 macro index,pager           gl      "<change-folder>+login<Return>" "Switch to INBOX folder"
+macro index,pager           ga      "<change-folder>+arch-general<Return>" "Switch to INBOX folder"