More bug fixes and updates for email.