Merge pull request #8555 from pivanov/bug-845061

Bug 845061 - Mail Settings Layout and Type Updates(cherry picked from commit 3b7fb2faf6fd7c4fb1ff568f7978e56fda1f6061)

Conflicts:
	apps/email/index.html
	apps/email/style/setup-cards.css