mutt: emac moves to the googley mail
Merge branch 'master' into ubuntu-x86_64-emac