More email tweaks