3 files changed, 6 insertions, 15 deletions
diff --git a/src/base/QXmppIq.cpp b/src/base/QXmppIq.cpp
index 351eeca7..635d5447 100644
--- a/src/base/QXmppIq.cpp
+++ b/src/base/QXmppIq.cpp
@@ -123,12 +123,10 @@ void QXmppIq::toXml( QXmlStreamWriter *xmlWriter ) const
 {
     xmlWriter->writeStartElement("iq");
 
-    helperToXmlAddAttribute(xmlWriter, "id", id());
-    helperToXmlAddAttribute(xmlWriter, "to", to());
-    helperToXmlAddAttribute(xmlWriter, "from", from());
+    QXmppStanza::toXmlElementFromChild(xmlWriter);
     helperToXmlAddAttribute(xmlWriter, "type", iq_types[d->type]);
     toXmlElementFromChild(xmlWriter);
-    error().toXml(xmlWriter);
+
     xmlWriter->writeEndElement();
 }
 
diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index d47233b9..86e808d2 100644
--- a/src/base/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
@@ -382,10 +382,8 @@ void QXmppMessage::parse(const QDomElement &element)
 void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const
 {
     xmlWriter->writeStartElement("message");
-    helperToXmlAddAttribute(xmlWriter, "xml:lang", lang());
-    helperToXmlAddAttribute(xmlWriter, "id", id());
-    helperToXmlAddAttribute(xmlWriter, "to", to());
-    helperToXmlAddAttribute(xmlWriter, "from", from());
+    QXmppStanza::toXmlElementFromChild(xmlWriter);
+
     helperToXmlAddAttribute(xmlWriter, "type", message_types[d->type]);
     if (!d->subject.isEmpty())
         helperToXmlAddTextElement(xmlWriter, "subject", d->subject);
@@ -393,7 +391,6 @@ void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const
         helperToXmlAddTextElement(xmlWriter, "body", d->body);
     if (!d->thread.isEmpty())
         helperToXmlAddTextElement(xmlWriter, "thread", d->thread);
-    error().toXml(xmlWriter);
 
     // chat states
     if (d->state > None && d->state <= Paused)
diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp
index 4c33590e..83f8081d 100644
--- a/src/base/QXmppPresence.cpp
+++ b/src/base/QXmppPresence.cpp
@@ -260,15 +260,11 @@ void QXmppPresence::parse(const QDomElement &element)
 void QXmppPresence::toXml(QXmlStreamWriter *xmlWriter) const
 {
     xmlWriter->writeStartElement("presence");
-    helperToXmlAddAttribute(xmlWriter,"xml:lang", lang());
-    helperToXmlAddAttribute(xmlWriter,"id", id());
-    helperToXmlAddAttribute(xmlWriter,"to", to());
-    helperToXmlAddAttribute(xmlWriter,"from", from());
+    QXmppStanza::toXmlElementFromChild(xmlWriter);
+
     helperToXmlAddAttribute(xmlWriter,"type", presence_types[d->type]);
     d->status.toXml(xmlWriter);
 
-    error().toXml(xmlWriter);
-
     // XEP-0045: Multi-User Chat
     if(!d->mucItem.isNull() || !d->mucStatusCodes.isEmpty())
     {