Bug 845040 - Email Inbox layout and type updates