Small changes in MailHandler