more email tweaks