Reworking mail setup.