diff --git a/assets/client.js b/assets/client.js
index 6516a4c..55e2be4 100644
--- a/assets/client.js
+++ b/assets/client.js
@@ -147,7 +147,10 @@ function createBuffer(name) {
 		messages: [],
 
 		addMessage: function(msg) {
-			buf.messages.push(msg);
+			if (!msg.tags) {
+				msg.tags = {};
+			}
+			// TODO: set time tag if missing
 
 			if (activeBuffer === buf) {
 				bufferElt.appendChild(createMessageElement(msg));