Hotfix: overwriting email templates
adjust changelog