minor mail related changes