Bug 845061 - Mail Settings Layout and Type Updates
Merge pull request #8555 from pivanov/bug-845061

Bug 845061 - Mail Settings Layout and Type Updates