diff --git a/mail/.config/neomutt/accounts/1-mail@oxapentane.com.muttrc b/mail/.config/neomutt/accounts/1-mail@oxapentane.com.muttrc
index d4aeb95..a00f170 100644
--- a/mail/.config/neomutt/accounts/1-mail@oxapentane.com.muttrc
+++ b/mail/.config/neomutt/accounts/1-mail@oxapentane.com.muttrc
@@ -7,8 +7,8 @@ set reverse_name
 set sendmail = "msmtp -a mail@oxapentane.com"
 alias me 0xA <mail@oxapentane.com>
 set folder = "~/mail/mail@oxapentane.com"
-set header_cache = ~/mail/mail@oxapentane.com/headers
-set message_cachedir = ~/mail/mail@oxapentane.com/bodies
+set header_cache = "~/.cache/mutt-cache/mail@oxapentane.com/headers"
+set message_cachedir = "~/.cache/mutt-cache/mail@oxapentane.com/bodies"
 set mbox_type = Maildir
 
 
@@ -49,3 +49,5 @@ macro index,pager gt "<change-folder>=Trash<enter>" "go to trash"
 macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash"
 macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash"
 set trash = "+Trash"
+
+source ./crypt.muttrc
diff --git a/mail/.config/neomutt/accounts/2-grigory@shipunov.xyz.muttrc b/mail/.config/neomutt/accounts/2-grigory@shipunov.xyz.muttrc
index bfa1471..a43c60a 100644
--- a/mail/.config/neomutt/accounts/2-grigory@shipunov.xyz.muttrc
+++ b/mail/.config/neomutt/accounts/2-grigory@shipunov.xyz.muttrc
@@ -5,8 +5,8 @@ set from = "grigory@shipunov.xyz"
 set sendmail = "msmtp -a grigory@shipunov.xyz"
 alias me Grigory Shipunov <grigory@shipunov.xyz>
 set folder = "~/mail/grigory@shipunov.xyz"
-set header_cache = ~/mail/grigory@shipunov.xyz/headers
-set message_cachedir = ~/mail/grigory@shipunov.xyz/bodies
+set header_cache = "~/.cache/mutt-cache/grigory@shipunov.xyz/headers"
+set message_cachedir = "~/.cache/mutt-cache/grigory@shipunov.xyz/bodies"
 set mbox_type = Maildir
 
 
@@ -44,3 +44,5 @@ macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
 macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
 macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
 set spoolfile = "+INBOX"
+
+source ./crypt.muttrc
diff --git a/mail/.config/neomutt/accounts/3-dump@dvb.solutions.muttrc b/mail/.config/neomutt/accounts/3-dump@dvb.solutions.muttrc
index f506a66..15a4974 100644
--- a/mail/.config/neomutt/accounts/3-dump@dvb.solutions.muttrc
+++ b/mail/.config/neomutt/accounts/3-dump@dvb.solutions.muttrc
@@ -5,8 +5,8 @@ set from = "dump@dvb.solutions"
 set sendmail = "msmtp -a dump@dvb.solutions"
 alias me dump <dump@dvb.solutions>
 set folder = "~/mail/dump@dvb.solutions"
-set header_cache = ~/dump@dvb.solutions/headers
-set message_cachedir = ~/dump@dvb.solutions/bodies
+set header_cache = "~/.cache/mutt-cache/dump@dvb.solutions/headers"
+set message_cachedir = "~/.cache/mutt-cache/dump@dvb.solutions/bodies"
 set mbox_type = Maildir
 
 
@@ -44,3 +44,5 @@ macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
 macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
 macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
 set spoolfile = "+INBOX"
+
+source ./nocrypt.muttrc
diff --git a/mail/.config/neomutt/accounts/crypt.muttrc b/mail/.config/neomutt/accounts/crypt.muttrc
new file mode 100644
index 0000000..cb7b689
--- /dev/null
+++ b/mail/.config/neomutt/accounts/crypt.muttrc
@@ -0,0 +1,12 @@
+# Encryption boilerplate
+set postpone_encrypt = yes
+set pgp_self_encrypt = yes
+set crypt_use_pka = no
+set crypt_autosign = yes
+set crypt_autoencrypt = no
+set crypt_autopgp = yes
+set crypt_replyencrypt = yes
+set crypt_replysign = yes
+
+# gpg key
+set pgp_default_key = "DD0998E6CDF294537FC604F991FA5E5BF9AA901C"
diff --git a/mail/.config/neomutt/accounts/nocrypt.muttrc b/mail/.config/neomutt/accounts/nocrypt.muttrc
new file mode 100644
index 0000000..43c19f2
--- /dev/null
+++ b/mail/.config/neomutt/accounts/nocrypt.muttrc
@@ -0,0 +1,9 @@
+# Encryption boilerplate
+set postpone_encrypt = no
+set pgp_self_encrypt = no
+set crypt_use_pka = no
+set crypt_autosign = no
+set crypt_autoencrypt = no
+set crypt_autopgp = no
+set crypt_replyencrypt = no
+set crypt_replysign = no
diff --git a/mail/.config/neomutt/defaults.muttrc b/mail/.config/neomutt/defaults.muttrc
index d2eefb5..a705c8a 100644
--- a/mail/.config/neomutt/defaults.muttrc
+++ b/mail/.config/neomutt/defaults.muttrc
@@ -57,21 +57,11 @@ bind index,pager,browser d half-down
 bind index,pager,browser u half-up
 bind index,pager S sync-mailbox
 bind index,pager R group-reply
-bind index \031 previous-undeleted	# Mouse wheel
-bind index \005 next-undeleted		# Mouse wheel
-bind pager \031 previous-line		# Mouse wheel
-bind pager \005 next-line		# Mouse wheel
 bind editor <Tab> complete-query
 
-#set crypt_autosign = yes
-#set crypt_opportunistic_encrypt = yes
-#set pgp_self_encrypt = yes
-#set pgp_default_key  = 'your@gpgemailaddre.ss'
-
 macro index,pager a "<enter-command>set my_pipe_decode=\$pipe_decode pipe_decode<return><pipe-message>abook --add-email<return><enter-command>set pipe_decode=\$my_pipe_decode; unset my_pipe_decode<return>" "add the sender address to abook"
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
 macro index O "<shell-escape>mbsync -a<enter>" "refresh all mail"
-macro index \Cf "<enter-command>unset wait_key<enter><shell-escape>printf 'Enter a search term to find with notmuch: '; read x; echo \$x >~/.cache/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"<enter>" "show only messages matching a notmuch pattern"
 macro index A "<limit>all\n" "show all messages (undo limit)"
 
 # Sidebar mappings
diff --git a/mail/.notmuch-config b/mail/.notmuch-config
index 45bec35..c25e4cd 100644
--- a/mail/.notmuch-config
+++ b/mail/.notmuch-config
@@ -1,8 +1,9 @@
 [database]
 path=/home/grue/mail
 [user]
-name=mail
+name=Grigory Shipunov
 primary_email=mail@oxapentane.com
+other_email=grigory@shipunov.xyz;*@oxapentane.com;dump@dvb.solutions
 [new]
 tags=unread;inbox;
 ignore=.mbsyncstate;.uidvalidity