Tweaks to email sending