diff --git a/symlinks/config/mutt/README.md b/symlinks/config/mutt/README.md
new file mode 100644
index 0000000..739ec70
--- /dev/null
+++ b/symlinks/config/mutt/README.md
@@ -0,0 +1,14 @@
+# (Neo)Mutt config
+
+## Vim-keys
+
+If error regarding vim-keys file appears, upgrade neomutt if possible, otherwise run the following:
+
+```sh
+mkdir -p /usr/share/doc/neomutt/vim-keys
+sudo wget -O /usr/share/doc/neomutt/vim-keys/vim-keys.rc https://raw.githubusercontent.com/neomutt/neomutt/master/contrib/vim-keys/vim-keys.rc
+```
+
+## Accounts
+
+Update accounts files with proper credentials. Generate app passwords when possible.
diff --git a/symlinks/config/mutt/accounts/.gitignore b/symlinks/config/mutt/accounts/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/symlinks/config/mutt/accounts/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/symlinks/config/mutt/accounts/personal b/symlinks/config/mutt/accounts/personal
new file mode 100644
index 0000000..c18ae0d
--- /dev/null
+++ b/symlinks/config/mutt/accounts/personal
@@ -0,0 +1,6 @@
+set imap_user = "username@mail.com"
+set imap_pass = "YOURAPPPASSWORD"
+set folder = "imapurl"
+set smtp_url = "smptul"
+set smtp_pass = "YOURAPPPASSWORD"
+set spoolfile = "+INBOX"
diff --git a/symlinks/config/mutt/muttrc b/symlinks/config/mutt/muttrc
index 914a665..fe74115 100644
--- a/symlinks/config/mutt/muttrc
+++ b/symlinks/config/mutt/muttrc
@@ -5,7 +5,8 @@ set record = +Sent
 # Directory to save drafts into
 set postponed = +Drafts
 # Headers cache?
-set header_cache = ~/.cache/mutt
+set header_cache = ~/.cache/mutt/headers
+set message_cachedir = ~/.cache/mutt/bodies
 # Sort by threads
 set sort = threads
 # Sort threads by last date received - newest first