Bug 845054 - Email folder layout and type updates