[3.8] Fix #1317 Enhance email template

- Fix #1317