Add support for nicks with messages
Add a better display of where the stuff comes from