enhanced emailed notification templates
Merge branch 'hotfix/mail-template'