--- a/mod_mam/mod_mam.lua	Sat Jul 18 23:05:09 2015 +0200
+++ b/mod_mam/mod_mam.lua	Sat Jul 18 23:11:59 2015 +0200
@@ -230,8 +230,10 @@
 	-- or that don't have a <body/>
 	or not stanza:get_child("body")
 	-- or if hints suggest we shouldn't
-	or stanza:get_child("no-permanent-storage", "urn:xmpp:hints")
-	or stanza:get_child("no-storage", "urn:xmpp:hints") then
+	or stanza:get_child("no-permanent-storage", "urn:xmpp:hints") -- The XEP needs to decide on "store" or "storage"
+	or stanza:get_child("no-permanent-store", "urn:xmpp:hints")
+	or stanza:get_child("no-storage", "urn:xmpp:hints")
+	or stanza:get_child("no-store", "urn:xmpp:hints") then
 		module:log("debug", "Not archiving stanza: %s (content)", stanza:top_tag());
 		return;
 	end