--- a/mod_mam/mod_mam.lua	Sun Jun 30 00:40:04 2013 +0200
+++ b/mod_mam/mod_mam.lua	Sun Jun 30 00:40:37 2013 +0200
@@ -311,11 +311,9 @@
 			resource = target_resource,
 			stanza = st.preserialize(stanza)
 		});
-		--[[ This was dropped from the spec
-		if ok then 
-			stanza:tag("archived", { xmlns = xmlns_mam, by = host, id = id }):up();
+		if ok and not c2s then
+			stanza:tag("archived", { xmlns = xmlns_mam, by = jid_bare(orig_to), id = id }):up();
 		end
-		--]]
 	else
 		module:log("debug", "Not archiving stanza: %s", stanza:top_tag());
 	end