Upgraded mail to new module system.