1 files changed, 4 insertions, 2 deletions
diff --git a/source/QXmppMessage.cpp b/source/QXmppMessage.cpp
index ad079d70..65c5de7f 100644
--- a/source/QXmppMessage.cpp
+++ b/source/QXmppMessage.cpp
@@ -117,9 +117,11 @@ void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const
     helperToXmlAddAttribute(xmlWriter, "to", getTo());
     helperToXmlAddAttribute(xmlWriter, "from", getFrom());
     helperToXmlAddAttribute(xmlWriter,  "type", getTypeStr());
-    helperToXmlAddTextElement(xmlWriter, "subject", getSubject());
+    if (!getSubject().isEmpty())
+        helperToXmlAddTextElement(xmlWriter, "subject", getSubject());
     helperToXmlAddTextElement(xmlWriter,"body", getBody());
-    helperToXmlAddTextElement(xmlWriter,"thread", getThread());
+    if (!getThread().isEmpty())
+        helperToXmlAddTextElement(xmlWriter,"thread", getThread());
     getError().toXml(xmlWriter);
     xmlWriter->writeEndElement();
 }