Fixes for email template markup and content.