(Hopefully) fixed message scraper.