Added a mail handler class