mozilla-b2g/gaia — pull request #8074 by asutherland (2013-02-13 02:21:16+00:00)
Title: Bug 808576 - Revise layout of New Mail Account (cherry picked from commit  1968b88e4725bb3e638a7e49dd0c9caf8f3aa501) a=approval-gaiva-v1

Conflicts resolved by just taking the current state of the v1-train branch.

Conflicts:
apps/email/locales/email.ar.properties
apps/email/locales/email.fr.properties
apps/email/locales/email.zh-TW.properties