Email refactoring and enhancements.
Merge branch 'master' of git@github.com:soluvas/soluvas-framework.git