Hotfix/email 2.0