Fix Mailer::normalizeContent calls

Change-Id: Iad3a0b51cf951529bf6a962976148d494f57f901
Merge "Fix Mailer::normalizeContent calls"