More email changes
Merge branch 'master' of https://github.com/Alanaktion/phproject