Bug 845040 - Email Inbox layout and type updates

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