Bug 845058 - Email Account layout and type updates

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