fix mail stuff