email template 6 changes fixing