mail handler fix