--- a/mod_mam/mod_mam.lua	Thu May 24 22:37:14 2012 +0200
+++ b/mod_mam/mod_mam.lua	Thu May 24 22:56:12 2012 +0200
@@ -157,6 +157,8 @@
 				orig_stanza.attr.xmlns = "jabber:client";
 				fwd_st:add_child(orig_stanza);
 				origin.send(fwd_st);
+			elseif qend and when > qend then
+				break -- We have passed into messages more recent than requested
 			end
 		end
 		-- That's all folks!