diff --git a/template/chat.tpl b/template/chat.tpl
index d42e48b..35a8676 100644
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -262,7 +262,7 @@
 	//<![CDATA[
 		TimWolla.WCF.Chat.titleTemplate = new WCF.Template('{ldelim}$title} - {'wcf.chat.title'|language|encodeJS} - {PAGE_TITLE|language|encodeJS}');
 		{capture assign='chatMessageTemplate'}{include file='chatMessage'}{/capture}
-		TimWolla.WCF.Chat.messageTemplate = new WCF.Template('{$chatMessageTemplate|encodeJS}');
+		TimWolla.WCF.Chat.messageTemplate = new WCF.Template('{@$chatMessageTemplate|encodeJS}');
 		TimWolla.WCF.Chat.init({$room->roomID}, 1);
 		TimWolla.WCF.Chat.handleMessages([
 			{implode from=$newestMessages item='message'}
diff --git a/template/chatMessage.tpl b/template/chatMessage.tpl
index 8a8dcbb..a9cbc73 100644
--- a/template/chatMessage.tpl
+++ b/template/chatMessage.tpl
@@ -1 +1 @@
-{literal}{@$formattedTime} {@$formattedUsername}{@$formattedMessage}{/literal}
+{literal}<time>{@$formattedTime}</time> {@$formattedUsername}{@$formattedMessage}{/literal}