I don't suppose you want to add support for data forms inside message stanzas as well as inside a [query xmlns="http://jabber.org/protocol/muc"] stanza do you? :)