Merge branch "Mail performance"
- Remove nested html header from the mail message body.