Bug 798292 - [Email] Inside message. Bubble with name shouldhave only name
Bug 835285 - Handle case where server has no calendar data r=kgrandon
Merge pull request #7830 from lightsofapollo/calendar-dont-process-empty-calendars

Bug 835285 - Handle case where server has no calendar data r=kgrandon
Merge pull request #7625 from steveck-chung/email-bubble-display-fix

Bug 798292 - [Email] Recipient names should not show email address. r=asuth