added email UI elements
Merge branch 'master' of https://github.com/michglass/GlassHouse