Fix #810 ,add additional template tags to email template