Tweak mailhandler parser for new version of mailhandler.