Bug 845048 - Email screen type and layout updates

Bug [#845048](https://bugzilla.mozilla.org/show_bug.cgi?id=845048)