diff --git a/mod_mam/src/mod_mam.erl b/mod_mam/src/mod_mam.erl
index ff18256..7d141f5 100644
--- a/mod_mam/src/mod_mam.erl
+++ b/mod_mam/src/mod_mam.erl
@@ -867,7 +867,9 @@ send_mam_message(#jid{luser = U, lserver = S} = JID, QueryID,
 		    attrs = [{<<"xmlns">>, ?NS_HINTS}]},
     Forwarded = #xmlel{name = <<"forwarded">>,
 		       attrs = [{<<"xmlns">>, ?NS_FORWARD}],
-		       children = [Stanza]},
+		       children = [xml:replace_tag_attr(<<"xmlns">>,
+							<<"jabber:client">>,
+							Stanza)]},
     Result = #xmlel{name = <<"result">>,
 		    attrs = [{<<"xmlns">>, ?NS_MAM},
 			     {<<"id">>, jlib:integer_to_binary(MamID)}]