Bug 845061 - Mail Settings Layout and Type Updates

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