Tweaks to email messages