--- a/mod_mam_muc/mod_mam_muc.lua	Wed Nov 05 12:12:49 2014 +0100
+++ b/mod_mam_muc/mod_mam_muc.lua	Sat Nov 08 15:45:19 2014 +0100
@@ -122,6 +122,7 @@
 	end);
 end
 
+-- Note: We ignore the 'with' field as this is internally used for stanza types
 local query_form = dataform {
 	{ name = "FORM_TYPE"; type = "hidden"; value = xmlns_mam; };
 	{ name = "with"; type = "jid-single"; };
@@ -159,7 +160,7 @@
 	local qid = query.attr.queryid;
 
 	-- Search query parameters
-	local qwith, qstart, qend;
+	local qstart, qend;
 	local form = query:get_child("x", "jabber:x:data");
 	if form then
 		local err;
@@ -167,8 +168,7 @@
 		if err then
 			return origin.send(st.error_reply(stanza, "modify", "bad-request", select(2, next(err))))
 		end
-		qwith, qstart, qend = form["with"], form["start"], form["end"];
-		qwith = qwith and jid_bare(qwith); -- dataforms does jidprep
+		qstart, qend = form["start"], form["end"];
 	end
 
 	if qstart or qend then -- Validate timestamps