Fix the way messages are passed to the scroller, close #415