More tweaks to the mail module.