a few more email tweaks