modified mail setup