Clean up content in email
Merge branch 'email-functionality-2'