Updated email
Merge branch 'mail-changes'