email generation changes