Added mail module