Merge pull request #19216 from jrburke/bug1009183-email-activity-blank-messages-2

Bug 1009183 - [email] activity launch, return to message list, no messages shown r=asuth
Conflicts:
	apps/email/js/cards/message_list.js