update'

merge

diff --cc email/.mutt/muttrc
index 00dfdeb,85ae982..ce3a6e4
--- 1/email/.mutt/muttrc
--- 2/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@@ -73,12 -72,16 +73,11 @@@ macro index,pager A 
      "<pipe-message>khard add-email<return>" \
      "add the sender email address to khard"
  
 -# Colors
 -source ~/.mutt/colors.muttrc
 -
 -# notmuch
 -source ~/.mutt/notmuch.muttrc
 +# sidebar
 +source ~/.mutt/sidebar.muttrc
  
  # Crypto
 -set crypt_use_gpgme=yes
 -set crypt_autosign
 -set crypt_replysign
 -set crypt_replysignencrypted=yes
 -set crypt_verify_sig=yes
 -message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp"
 +source ~/.mutt/gpg.muttrc
 +
 +# Colors
 +source ~/.mutt/colors.muttrc
-