More mail logic
Merge branch 'master' of https://github.com/keyaral/SwenProject.git