Added mail related configuration