Removed duplicate question at start of email.
Merge branch 'release/Email_fixes'