Various email-related changes