Messenger cleanup

https://www.deimeke.net/dirk/blog/index.php?/archives/4002-Messenger-cleanup.html