Email should be editable by admin
Merge branch 'custom_email_content'