Fix #1317 Enhance email template