Merge pull request #18390 from mcav/icon-repeated

Bug 992876 - Reply icon repeated. r=jrburke
Conflicts:
	apps/email/js/cards/message_reader.html