email service tweaks