Modified mail module