Fix #2453 (malformed stanzas with stupid plugins)

remove xhtml prior to performing stuff