Changes to the mail module