start of email views
Merge branch 'email-view'