more email improvements
Merge branch 'master' of github.com:FotoVerite/nametagday