fix mail handler