Bug 853952 - When a user edits and saves an event, return to the app root
Bug 863899 - [email] Account Type field in settings doesn't show the account type; rs=asuth
Merge pull request #9389 from mozsquib/email-account-type

Bug 863899 - [email] Account Type field in settings doesn't show the account type
Bug 848266 - [email] Have MailAPI resolve e-mail addresses to contacts; r=asuth, r=squib
Merge pull request #9390 from mozsquib/email-resolve-contacts

Bug 848266 - [email] Have MailAPI resolve e-mail addresses to contacts
Bug 852003 - [email] ActiveSync mimetype-guessing fails for files with non-lowercase extensions (e.g. foo.PNG); r=asuth
Merge pull request #9391 from mozsquib/email-as-contenttype-infer

Bug 852003 - [email] ActiveSync mimetype-guessing fails for files with non-lowercase extensions (e.g. foo.PNG)
Merge pull request #9159 from gaye/bug-853952

Bug 853952 - When a user edits and saves an event, return to the app root