diff --git a/bin/mw b/bin/mw
index 6d26188..f97f0bd 100755
--- a/bin/mw
+++ b/bin/mw
@@ -64,8 +64,8 @@ set from = \"$fulladdr\"
 set sendmail = \"/usr/bin/msmtp -a $title\"
 alias me $realname <$fulladdr>
 set folder = \"$maildir/$title\"
-set header_cache = $cachedir/$title/cache/headers
-set message_cachedir = $cachedir/$title/cache/bodies
+set header_cache = $cachedir/$title/headers
+set message_cachedir = $cachedir/$title/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
@@ -85,8 +85,8 @@ set sendmail = \"/usr/bin/msmtp -a $title\"
 alias me $realname <$fulladdr>
 set folder = \"imaps://$fulladdr@$imap:$iport\"
 set imap_user = \"$login\"
-set header_cache = $cachedir/$title/cache/headers
-set message_cachedir = $cachedir/$title/cache/bodies
+set header_cache = $cachedir/$title/headers
+set message_cachedir = $cachedir/$title/bodies
 set imap_pass = \`pass mutt-wizard-$title\`
 
 set mbox_type = Maildir
@@ -152,7 +152,7 @@ EOF
 	[ -z "$login" ] && login="$fulladdr"
 	getpass
 	getprofiles
-	mkdir -p "$muttdir" "$accdir/$title" "$cachedir/$title/cache/bodies" "$HOME/.config/msmtp"
+	mkdir -p "$muttdir" "$accdir/$title" "$cachedir/$title/bodies" "$HOME/.config/msmtp"
 	getaccounts
 	for x in $(seq 1 9); do echo "$accounts" | grep "$x" >/dev/null 2>&1 || { export idnum="$x"; break ;}; done
 	[ ! -f "$HOME/.config/msmtp/config" ] && echo "$msmtp_header" > "$HOME/.config/msmtp/config"