1 files changed, 27 insertions, 22 deletions
diff --git a/tools/conf/etc/skel/.mutt/muttrc b/tools/conf/etc/skel/.mutt/muttrc
index a56757e..aa41d50 100644
--- a/tools/conf/etc/skel/.mutt/muttrc
+++ b/tools/conf/etc/skel/.mutt/muttrc
@@ -11,30 +11,34 @@ set sort_browser=reverse-date
 set sort_aux=reverse-last-date-received
 set duplicate_threads=yes
 
-source ~/.mutt/gpg.rc
+set crypt_use_gpgme=yes
 
-set pgp_autosign=yes
-set pgp_sign_as=0x1D327CA1
-set pgp_replyencrypt=yes
 set pgp_timeout=1800
 
-# automatically sign all outgoing messages
-set crypt_autosign
+## sign only replies to signed messages
+set crypt_replysign=yes
 
-# sign only replies to signed messages
-set crypt_replysign
-
-# automatically encrypt outgoing messages
-#set crypt_autoencrypt=yes
-
-# encrypt only replies to signed messages
-set crypt_replyencrypt=yes
-
-# encrypt and sign replies to encrypted messages
+## encrypt and sign replies to encrypted messages
 set crypt_replysignencrypted=yes
 
-# automatically verify the sign of a message when opened
-set crypt_verify_sig=yes
+#source ~/.mutt/gpg.rc
+#
+#set pgp_autosign=yes
+#set pgp_sign_as=0xEE29B7D3
+#set pgp_replyencrypt=yes
+#
+## automatically sign all outgoing messages
+#set crypt_autosign
+#
+## automatically encrypt outgoing messages
+##set crypt_autoencrypt=yes
+#
+## encrypt only replies to signed messages
+#set crypt_replyencrypt=yes
+#
+## automatically verify the sign of a message when opened
+#set crypt_verify_sig=yes
+#
 
 source "~/.mutt/mail_alias"
 set alias_file=~/.mutt/mail_alias
@@ -52,14 +56,15 @@ set mail_check=5  # mutt checks for new mails on every keystroke
 set beep_new      # beep on new messages in the mailboxes
 
 ## Local system account
-folder-hook 'Mail' 'source ~/.mutt/system'
+folder-hook '.mail' 'source ~/.mutt/system'
 
 ## Remote account
-folder-hook 'MailExt' 'source ~/.mutt/external'
+folder-hook '.mailext' 'source ~/.mutt/external'
 
 ## Default account
-source "~/.mutt/system"
+source ~/.mutt/system
 
 ## Shortcuts
-macro index,pager <f2> '<sync-mailbox><enter-command>source ~/.mutt/system<enter><change-folder>!<enter>'
 macro index,pager <f3> '<sync-mailbox><enter-command>source ~/.mutt/external<enter><change-folder>!<enter>'
+
+macro index,pager <f2> '<sync-mailbox><enter-command>source ~/.mutt/system<enter><change-folder>!<enter>'