fix email host
Merge branch 'email'
Return to home'
Merge branch 'home'