Email content revamp
Merge branch 'master' of https://github.com/UnicycleLabs/intouch