Added mail setup