diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/UserAvatarManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/UserAvatarManager.java
index 91d378eb1..8a59f8557 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/UserAvatarManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/UserAvatarManager.java
@@ -83,7 +83,7 @@ import org.jxmpp.jid.EntityBareJid;
  * <p>
  * Fetching avatars published via HTTP is out of scope of this manager. If you do implement it, remember to mark the
  * avatar as locally available in your {@link AvatarMetadataStore} after you retrieved it.
- * 
+ *
  * @author Fernando Ramirez
  * @author Paul Schaub
  * @see <a href="http://xmpp.org/extensions/xep-0084.html">XEP-0084: User
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/element/DataExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/element/DataExtension.java
index 649e102d7..4dbb8e095 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/element/DataExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/element/DataExtension.java
@@ -92,7 +92,7 @@ public class DataExtension implements ExtensionElement {
 
     @Override
     public CharSequence toXML(XmlEnvironment xmlEnvironment) {
-        XmlStringBuilder xml = new XmlStringBuilder(this);
+        XmlStringBuilder xml = new XmlStringBuilder(this, xmlEnvironment);
         xml.rightAngleBracket();
         xml.escape(this.getDataAsString());
         xml.closeElement(this);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/element/MetadataExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/element/MetadataExtension.java
index 9a18184ec..29aa943a3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/element/MetadataExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/element/MetadataExtension.java
@@ -102,7 +102,7 @@ public class MetadataExtension implements ExtensionElement {
 
     @Override
     public CharSequence toXML(XmlEnvironment xmlEnvironment) {
-        XmlStringBuilder xml = new XmlStringBuilder(this);
+        XmlStringBuilder xml = new XmlStringBuilder(this, xmlEnvironment);
         appendInfoElements(xml);
         appendPointerElements(xml);
         closeElement(xml);