Bug 845058 - Email Account layout and type updates