# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1567260909 -7200
# Node ID 58685d77c07c5b2e8a4ad8041330c4a920ac61ee
# Parent  949b1b72537adbc83d4043a01387f0305d06b1ff# Parent  dd7e924c74ef27b7f92eb872d2db50aaa229b234
Merge 0.11->trunk

diff -r 949b1b72537a -r 58685d77c07c plugins/muc/history.lib.lua
--- a/plugins/muc/history.lib.lua	Sat Aug 31 16:15:51 2019 +0200
+++ b/plugins/muc/history.lib.lua	Sat Aug 31 16:15:09 2019 +0200
@@ -178,10 +178,10 @@
 	local ts = gettime();
 	local stamp = datetime.datetime(ts);
 	stanza:tag("delay", { -- XEP-0203
-		xmlns = "urn:xmpp:delay", from = module.host, stamp = stamp
+		xmlns = "urn:xmpp:delay", from = room.jid, stamp = stamp
 	}):up();
 	stanza:tag("x", { -- XEP-0091 (deprecated)
-		xmlns = "jabber:x:delay", from = module.host, stamp = datetime.legacy()
+		xmlns = "jabber:x:delay", from = room.jid, stamp = datetime.legacy()
 	}):up();
 	local entry = { stanza = stanza, timestamp = ts };
 	table.insert(history, entry);