1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/generator/IqGenerator.java b/src/main/java/de/pixart/messenger/generator/IqGenerator.java
index eab087975..918c95e6f 100644
--- a/src/main/java/de/pixart/messenger/generator/IqGenerator.java
+++ b/src/main/java/de/pixart/messenger/generator/IqGenerator.java
@@ -248,10 +248,10 @@ public class IqGenerator extends AbstractGenerator {
 
     public IqPacket queryMessageArchiveManagement(final MessageArchiveService.Query mam) {
         final IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
-        final Element query = packet.query(mam.isLegacy() ? Namespace.MAM_LEGACY : Namespace.MAM);
+        final Element query = packet.query(mam.version.namespace);
         query.setAttribute("queryid", mam.getQueryId());
         final Data data = new Data();
-        data.setFormType(mam.isLegacy() ? Namespace.MAM_LEGACY : Namespace.MAM);
+        data.setFormType(mam.version.namespace);
         if (mam.muc()) {
             packet.setTo(mam.getWith());
         } else if (mam.getWith() != null) {
@@ -325,7 +325,7 @@ public class IqGenerator extends AbstractGenerator {
         Element query = packet.query("http://jabber.org/protocol/muc#admin");
         for (Jid jid : jids) {
             Element item = query.addChild("item");
-            item.setAttribute("jid", jid.toString());
+            item.setAttribute("jid", jid.toEscapedString());
             item.setAttribute("affiliation", affiliation);
         }
         return packet;
@@ -455,8 +455,9 @@ public class IqGenerator extends AbstractGenerator {
         options.putString("muc#roomconfig_membersonly", "1");
         options.putString("muc#roomconfig_publicroom", "0");
         options.putString("muc#roomconfig_whois", "anyone");
-        options.putString("muc#roomconfig_enablearchiving", "1");
-        options.putString("mam", "1");
+        options.putString("muc#roomconfig_enablearchiving", "1"); //prosody
+        options.putString("mam", "1"); //ejabberd community
+        options.putString("muc#roomconfig_mam", "1"); //ejabberd saas
         return options;
     }