diff --git a/mutt/mailcap b/Ansible/roles/dotfiles/files/mutt/mailcap
similarity index 100%
rename from mutt/mailcap
rename to Ansible/roles/dotfiles/files/mutt/mailcap
diff --git a/muttrc b/Ansible/roles/dotfiles/files/mutt/muttrc
similarity index 92%
rename from muttrc
rename to Ansible/roles/dotfiles/files/mutt/muttrc
index 6ec822c..19b0b9b 100644
--- a/muttrc
+++ b/Ansible/roles/dotfiles/files/mutt/muttrc
@@ -19,9 +19,9 @@ set timeout=300
 set imap_keepalive=300
 
 # Caching
-set header_cache="~/.mutt/cache/headers"
-set message_cachedir="~/.mutt/cache/bodies"
-set certificate_file="~/.mutt/certificates"
+set header_cache="~/.local/state/mutt/cache/headers"
+set message_cachedir="~/.local/state/mutt/cache/bodies"
+set certificate_file="~/.local/state/mutt/certificates"
 
 set use_from=yes
 set envelope_from=yes
@@ -50,14 +50,14 @@ hdr_order Date: From: To: Cc: Subject:
 
 # Aliases
 set reverse_alias=yes
-set alias_file="~/.mutt/aliases"
+set alias_file="~/.config/mutt/aliases"
 
 # Composing and Sending
 set edit_headers=yes
 set include=yes
 
 # HTML email :(
-set mailcap_path="~/.mutt/mailcap"
+set mailcap_path="~/.config/mutt/mailcap"
 auto_view text/html
 alternative_order text/html text/plain text/enriched
 
diff --git a/mutt/view_attachment.sh b/Ansible/roles/dotfiles/files/mutt/view_attachment.sh
similarity index 100%
rename from mutt/view_attachment.sh
rename to Ansible/roles/dotfiles/files/mutt/view_attachment.sh
diff --git a/Ansible/roles/dotfiles/tasks/main.yml b/Ansible/roles/dotfiles/tasks/main.yml
index f8ff950..989d436 100644
--- a/Ansible/roles/dotfiles/tasks/main.yml
+++ b/Ansible/roles/dotfiles/tasks/main.yml
@@ -11,5 +11,8 @@
   ansible.builtin.include_tasks: git.yml
   tags: dotfiles_git
 
+- name: Mutt
+  ansible.builtin.include_tasks: mutt.yml
+
 - name: Shell utilities
   ansible.builtin.include_tasks: shell_utilities.yml
diff --git a/Ansible/roles/dotfiles/tasks/mutt.yml b/Ansible/roles/dotfiles/tasks/mutt.yml
new file mode 100644
index 0000000..6cf777d
--- /dev/null
+++ b/Ansible/roles/dotfiles/tasks/mutt.yml
@@ -0,0 +1,25 @@
+---
+- name: (mutt) Link muttrc
+  ansible.builtin.file:
+    path: ~/.muttrc
+    src: "{{ role_path }}/files/mutt/muttrc"
+    state: link
+    force: true
+
+- name: (mutt) Make mutt config directory
+  ansible.builtin.file:
+    path: ~/.config/mutt
+    state: directory
+    force: true
+
+- name: (mutt) Link mailcap
+  ansible.builtin.file:
+    path: ~/.config/mutt/mailcap
+    src: "{{ role_path }}/files/mutt/mailcap"
+    state: link
+    force: true
+
+- name: (mutt) Create local state directory
+  ansible.builtin.file:
+    path: ~/.local/state/mutt
+    state: directory