Moved a couple forgotten messages for the Mail module