fix mail_handler