--- a/mod_mam_muc/mod_mam_muc.lua	Tue Feb 14 09:51:59 2017 +0100
+++ b/mod_mam_muc/mod_mam_muc.lua	Tue Feb 14 09:53:09 2017 +0100
@@ -259,12 +259,12 @@
 		for i = #results, 1, -1 do
 			origin.send(results[i]);
 		end
+		first, last = last, first;
 	end
 
 	-- That's all folks!
 	module:log("debug", "Archive query %s completed", tostring(qid));
 
-	if reverse then first, last = last, first; end
 	origin.send(st.message(msg_reply_attr)
 		:tag("fin", { xmlns = xmlns_mam, queryid = qid, complete = complete })
 			:add_child(rsm.generate {