diff --git a/src/plugins/plugin_xep_0071.py b/src/plugins/plugin_xep_0071.py
index e5a2626b..78389f2b 100644
--- a/src/plugins/plugin_xep_0071.py
+++ b/src/plugins/plugin_xep_0071.py
@@ -160,8 +160,13 @@ class XEP_0071(object):
                 elem.drop_tree()
             else:
                 elem.drop_tag()
+        if len(body_elt) !=1:
+            root_elt = body_elt
+            body_elt.tag = "p"
+        else:
+            root_elt = body_elt[0]
 
-        return html.tostring(body_elt, encoding='unicode', method='xml')
+        return html.tostring(root_elt, encoding='unicode', method='xml')
 
 class XEP_0071_handler(XMPPHandler):
     implements(iwokkel.IDisco)