--- a/mod_storage_xmlarchive/mod_storage_xmlarchive.lua	Tue May 19 16:45:51 2015 +0200
+++ b/mod_storage_xmlarchive/mod_storage_xmlarchive.lua	Tue May 19 16:46:20 2015 +0200
@@ -161,7 +161,7 @@
 					if result then
 						local stanza = result;
 						result = nil;
-						return item.id, stanza, item.when, item.with;
+						return item.id, stanza, i_when, i_with;
 					end
 				end
 				if (rev and item.id == query.after) or