Bug 863610 - [email] Accounts in the Account Setup can take two lines; r=asuth