More beautification
Merge branch 'master' of github.com:ranok/saferemail