Correct email host helper
Merge branch 'devel'