Bug 845054 - Email folder layout and type updates
Merge pull request #8553 from pivanov/bug-845054

Bug 845054 - Email folder layout and type updates