Removed XMPPMessageWrapper and adding the XMPPMessage extensions category