More message event handling and hopefully reduction. I'm not yet happy about that implementation.