Email templating updates