Updates to the emails.
Merge branch 'emails'