-macro compose <esc>2 "<esc>f^UMart Lubbers <mart@cs.ru.nl><enter>"
-# Disable pgp when sending from a ru address
-send2-hook '((~f m.lubbers@cs.ru.nl)|(~f m.lubbers@science.ru.nl)|(~f mart@cs.ru.nl)) (~g|~G)'\
- 'push <pgp-menu>c'
+alias identity_1 Mart Lubbers <mart@martlubbers.net>
+alias identity_2 Mart Lubbers <mart@cs.ru.nl>
+macro compose v "<edit-from>^Uidentity\_<tab>" "Select from"
+macro compose <esc>1 "<esc>f^UMart Lubbers <mart@martlubbers.net><enter>ps"
+macro compose <esc>2 "<esc>f^UMart Lubbers <mart@cs.ru.nl><enter>ps"
+macro compose <esc>3 "<esc>f^UMart Lubbers <mart.lubbers@ru.nl><enter>pc"
+
+macro index,compose <esc>1 "<enter-command>source ~/.config/mutt/net.muttrc<enter><change-folder>=INBOX<enter>"
+macro index,compose <esc>2 "<enter-command>source ~/.config/mutt/ru.muttrc<enter><change-folder>=INBOX<enter>"
+folder-hook ~/.local/share/offlineimap/mail/net/* 'source ~/.config/mutt/net.muttrc'
+folder-hook ~/.local/share/offlineimap/mail/ru/* 'source ~/.config/mutt/ru.muttrc'