mbsync/notmuch/mutt changes to support multiple accounts