Merge pull request #9304 from mozsquib/email-account-setup-wrap

Bug 863610 - [email] Accounts in the Account Setup can take two lines(cherry picked from commit e0fec96c6e934d39c2da3fec41af01de72f0ac07)