Bug 845061 - Mail Settings Layout and Type Updates