diff --git a/xep-0369.xml b/xep-0369.xml
index f7a905eb..7deb0d5e 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -41,6 +41,9 @@
     <initials>sek</initials>
     <remark><p>
       Replace &lt;submission-id/&gt; with XEP-0359;
+      Make Message Archiving Optional;
+      Clarify that participant node only contains real JIDs;
+      Change message retrieval from archive to reflect that MIX-PAM archive is now optional;
     </p></remark>
   </revision>   
   <revision>
@@ -49,8 +52,6 @@
     <initials>lnj</initials>
     <remark><p>
       Remove MIX xmlns from pubsub channel info &lt;item/&gt; example;
-      Make Message Archiving Optional;
-      Clarify that participant node only contains real JIDs;
     </p></remark>
   </revision>   
   <revision>
@@ -1253,10 +1254,11 @@
     </section3>
     <section3 topic="Retrieving Messages" anchor="use-mam-retrieve">
       <p>
-        Clients will retrieve MIX messages using standard MAM protocol from the user's archive.  The MAM query will filter based on the channel JID to enable access to messages from a given channel. This gives the user a simple mechanism to access all messages sent to the channel.   MAM can be used to retrieve older messages that have not been cached by the client.
+        The client's local server MAY archive messages and advertise this capability as specified in &xep0405;.   If this is done,
+        clients MUST retrieve MIX messages using standard MAM protocol from the user's archive.  The MAM query will filter based on the channel JID to enable access to messages from a given channel. This gives the user a simple mechanism to access all messages sent to the channel.   MAM can be used to retrieve older messages that have not been cached by the client.
       </p>
       <p>
-        Messages can also be retrieved from the channel by addressing MAM queries to the channel JID.   This will behave like a standard MAM archive.  This can be useful for administrators to access archived messages.  It can also be useful for new channel participants to access the historical archives.
+        Messages can also be retrieved from the channel by addressing MAM queries to the channel JID.   This will behave like a standard MAM archive.  This can be useful for administrators to access archived messages.  This enables new channel participants to access the historical archives.
       </p>
     </section3>
     <section3 topic="MAM Use with other Channel Nodes" anchor="use-mam-other-nodes">