diff --git a/code/controllers/subsystem/chat.dm b/code/controllers/subsystem/chat.dm
index 0fd32eb54a9..f93ab6e09f6 100644
--- a/code/controllers/subsystem/chat.dm
+++ b/code/controllers/subsystem/chat.dm
@@ -43,6 +43,7 @@ SUBSYSTEM_DEF(chat)
 
 /datum/controller/subsystem/chat/proc/send_payload_to_client(client/target, datum/chat_payload/payload)
 	target.tgui_panel.window.send_message("chat/message", payload.into_message())
+	SEND_TEXT(target, payload.get_content_as_html())
 
 /datum/controller/subsystem/chat/fire()
 	for(var/ckey in client_to_payloads)
diff --git a/code/datums/chat_payload.dm b/code/datums/chat_payload.dm
index 8f2dac281aa..fd35bbc4eec 100644
--- a/code/datums/chat_payload.dm
+++ b/code/datums/chat_payload.dm
@@ -10,3 +10,7 @@
 /// Converts the chat payload into a JSON string
 /datum/chat_payload/proc/into_message()
 	return "{\"sequence\":[sequence],\"content\":[json_encode(content)]}"
+
+/// Returns an HTML-encoded message from our contents.
+/datum/chat_payload/proc/get_content_as_html()
+	return message_to_html(content)