Bug 844978 - Email Manual Setup Layout and Type updates

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