-send2-hook "~f mart@martlubbers.net" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\""
-send2-hook "~f mart.lubbers@student.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
+
+# Set the correct msmtp account for the different addresses
+send2-hook '~f mart@martlubbers.net'\
+ 'set sendmail="msmtp -C /home/mrl/.config/msmtp/config -a net"'
+send2-hook '((~f m.lubbers@cs.ru.nl)|(~f m.lubbers@science.ru.nl)|(~f mart@cs.ru.nl))'\
+ 'set sendmail="msmtp -C /home/mrl/.config/msmtp/config -a ru"'
+
+# Macro for switching to the ru address
+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'