added mail handler