FIXING MAILHANDLER