Hotfix: Repaired email forms after wrong merge
Merge branch 'hotfix/0.2.3'