diff --git a/xep-0369.xml b/xep-0369.xml
index 5518d9bd..15fe92ec 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -45,6 +45,7 @@
      Shorten the example BIND2 resources;
      Fix Disco features to not use second namespace;
      Correct encoding of jid-multi;
+     MAM intro clarification;
     </p></remark>
   </revision>
   <revision>
@@ -312,7 +313,7 @@
 </p>
   </section2>
   <section2 topic="MIX and MAM" anchor="concepts-mam">
-    <p> Historical data (such as the messages sent to the channel) is stored in an archive supporting  Message Archive Management (MAM) so that clients can subsequently access this data with MAM. Each node can be archived separately (e.g., the presence node or the configuration node). MIX clients can retrieve archived information with MAM in order to quickly resync messages with regard to a channel, and can do so without providing presence information.</p>
+    <p> Historical data (such as the messages sent to the channel) is stored in an archive supporting  Message Archive Management (MAM) so that clients can subsequently access this data with MAM. Each node can be archived separately (e.g., the presence node or the configuration node).  MIX messages are archived by both the MIX channel and the user's server, so that clients can generally use their local MAM archiver.  MIX clients can retrieve archived information with MAM in order to quickly resync messages with regard to a channel, and can do so without providing presence information.</p>
   </section2>
   <section2 topic="Behaviour of MIX Participant's Server" anchor="concepts-mix-participant-server">
     <p>