Bug 845054 - Email folder layout and type updates

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