Updated version of mail that we depend on