diff --git a/mutt/.mutt/mailcap b/mutt/.mutt/mailcap
index d6595f6..d05d28c 100644
--- a/mutt/.mutt/mailcap
+++ b/mutt/.mutt/mailcap
@@ -1,12 +1,12 @@
 # text/html; w3m -I %{charset} -T text/html; copiousoutput;
 # text/html; pandoc -f html -t markdown; copiousoutput; compose=vim %s
 # application/pdf; pandoc -f html -t markdown; copiousoutput; compose=vim %s
-application/pdf; ~/.mutt/attach_fork.sh okular %s
-application/vnd.openxmlformats-officedocument.wordprocessingml.document; libreoffice %s
-application/octet-stream; ~/.mutt/attach_fork.sh okular %s
+application/pdf; ~/.mutt/attach_fork.sh %s okular
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; ~/.mutt/attach_fork.sh %s libreoffice
+application/octet-stream; ~/.mutt/attach_fork.sh %s okular
 
 text/html; ~/.mutt/gen_html.sh %s
 text/html; w3m -I %{charset} -T text/html; copiousoutput
 
-image/jpeg; feh
-image/png; feh
+image/jpeg; ~/.mutt/attach_fork.sh %s feh
+image/png; ~/.mutt/attach_fork.sh %s feh
diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc
index 712833c..3ea44f2 100644
--- a/mutt/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
@@ -37,11 +37,8 @@ set editor="vim -c 'set syntax=mail ft=mail enc=utf-8 formatoptions-=t'"
 # macro index 2
 set move = no
 
-# macro index,pager d "<save-message>=Archive<enter><enter><sync-mailbox><enter>" "Archive"
-# macro index,pager y "<save-message>=Archive<enter><enter><sync-mailbox><enter>" "Archive"
-
 # Aliases
-set alias_file = "~/.mutt/aliases"
+set alias_file = "~/.mutt-private/aliases"
 set sort_alias = alias
 set reverse_alias = yes
 source $alias_file
@@ -60,12 +57,15 @@ auto_view text/html
 
 # urls
 # macro pager \cb <pipe-entry>'tr -d "\n" | w3m'<enter> 'Follow links in w3m'
- macro pager \cb <pipe-entry>'w3m'<enter> 'Follow links in w3m'
+# macro pager \cb <pipe-entry>'w3m'<enter> 'Follow links in w3m'
 # macro pager \cb <pipe-entry>'pandoc -f html -t markdown | vim -'<enter> 'Open as markdown'
 
+set wait_key = no
+
 set mailcap_path = ~/.mutt/mailcap
 
 # macro index z "!mbsync -a^M" "Update through mbsync"
 
-source ~/.mutt/private
+# Load account information
+source ~/.mutt-private/private
 # vim: set ft=muttrc