more email improvements