diff --git a/mutt.spec b/mutt.spec
index 612e1af..3620202 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -22,6 +22,7 @@ cp -rv %{SOURCE0}/  %{buildroot}/srv/salt
 if [ $1 -eq 1 ]; then
   qubesctl state.apply mutt.clone
   qubesctl --skip-dom0 --targets=template-mutt state.apply mutt.install
+  qubesctl state.apply mutt.configure
 fi
 
 %preun
diff --git a/mutt/clone.sls b/mutt/clone.sls
index cdeb248..045221f 100644
--- a/mutt/clone.sls
+++ b/mutt/clone.sls
@@ -5,5 +5,5 @@ qvm-clone-id:
   qvm.clone:
     - require:
       - sls: template-debian-11-minimal
-    - name: template-mail
+    - name: template-mutt
     - source: debian-11-minimal
diff --git a/mutt/clone.top b/mutt/clone.top
index 488dc5d..feb8225 100644
--- a/mutt/clone.top
+++ b/mutt/clone.top
@@ -1,4 +1,4 @@
 base:
   dom0:
     - match: nodegroup
-    - mail.clone
+    - mutt.clone
diff --git a/mutt/install.sls b/mutt/install.sls
index b9411ce..41847a9 100644
--- a/mutt/install.sls
+++ b/mutt/install.sls
@@ -1,6 +1,8 @@
 # vim: set syntax=yaml ts=2 sw=2 sts=2 et :
 #
 
+{% if grains['nodename'] != 'dom0' %}
+
 {% if salt['qvm.exists']('cacher') %}
 
 /etc/apt/sources.list:
@@ -14,7 +16,6 @@
 
 {% endif %}
 
-{% if grains['nodename'] != 'dom0' %}
 update:
   pkg.uptodate:
     - refresh: True
@@ -23,15 +24,18 @@ installed:
   pkg.installed:
     - pkgs:
       - qubes-core-agent-networking
+      - qubes-app-shutdown-idle
+      - qubes-gpg-split
       - mb2md
       - mutt
       - notmuch
       - notmuch-mutt
+      - offline-imap
       - openssh-client
-      - qubes-app-shutdown-idle
       - rsync
       - w3m
     - skip_suggestions: True
+    - install_recommends: False
 
 change_timeout:
   file.replace:
@@ -47,5 +51,4 @@ default_muttrc:
     - user: user
     - group: user
 
-
 {% endif %}
diff --git a/mutt/install.top b/mutt/install.top
index 6a4e637..6c9fe29 100644
--- a/mutt/install.top
+++ b/mutt/install.top
@@ -1,5 +1,5 @@
 # vim: set syntax=yaml ts=2 sw=2 sts=2 et :
 
 base:
-  template-mail:
-    - mail.install
+  template-mutt:
+    - mutt.install
diff --git a/mutt/muttrc b/mutt/muttrc
index 30e0a67..41dee39 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -1,7 +1,46 @@
+##############################
+###   USER CONFIGURATION   ### 
+# UNCOMMENT THE RELEVANT LINES AND INSERT YOUR DETAILS
+
+## PGP
+# Specify what key to use for signing here:
+#set pgp_sign_as=0x
+
+
+## IMAP
+#set folder=imaps://YOUR_SERVER/
+#set imap_user=YOUR_USERNAME_HERE
+#set imap_pass=YOUR_PASSWORD_HERE
+#set spoolfile=+INBOX
+#set imap_check_subscribed
+
+
+## POP3
+#set pop_host=pops://YOUR_SERVER
+#set pop_user=YOUR_USERNAME_HERE
+#set pop_pass=YOUR_PASSWORD_HERE
+#set pop_checkinterval=120
+#set pop_delete=ask-no
+#set pop_last=yes
+
+
+##SMTP
+#set my_user=YOUR_USERNAME_HERE
+#set smtp_url=smtps://$my_user@YOUR_SMTP_SERVER
+#set ssl_force_tls=yes
+#set record= +Sent
+#set smtp_pass=YOUR_PASSWORD_HERE
+#set realname=YOUR_REAL_NAME
+#set from=YOUR_EMAIL_ADDRESS
+#set use_from=yes
+#set ssl_starttls=yes
+#set ssl_force_tls=yes
+
+### END USER CONFIGURATION ###
+##############################
+
 set pgp_use_gpg_agent = no
 set crypt_use_gpgme=no
-# Specify what key to use for signing here:
-set pgp_sign_as=0x
 
 # decode application/pgp
 set pgp_decode_command="qubes-gpg-client-wrapper -d --status-fd=2 --batch  %f"