XMPP

changes required by the XMPP backend.