--- a/mod_mam/mod_mam.lua	Fri Jul 12 22:54:41 2013 +0200
+++ b/mod_mam/mod_mam.lua	Fri Jul 12 23:18:30 2013 +0200
@@ -213,13 +213,9 @@
 	-- That's all folks!
 	module:log("debug", "Archive query %s completed", tostring(qid));
 
-	local reply = st.reply(stanza);
-	if last then
-		-- This is a bit redundant, isn't it?
-		reply:query(xmlns_mam):add_child(rsm.generate{first = (reverse and last or first), last = (reverse and first or last), count = #data});
-	end
-	origin.send(reply);
-	return true
+	return origin.send(st.reply(stanza)
+		:query(xmlns_mam):add_child(rsm.generate {
+			first = (reverse and last or first), last = (reverse and first or last), count = #data}));
 end);
 
 local function has_in_roster(user, who)