major update towards better XMPP integration