fix mail dispatcher