diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index c35f138829..7184dca42d 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -227,9 +227,9 @@ define(['taskbar', 'string'], function(taskbar, S) {
 		var chatContent = chatModal.find('#chat-content');
 
 		var date = new Date(parseInt(timestamp, 10));
-        // todo Add this to a stylesheet instead of style tag
-        var prefix = '<span style="color: darkgrey;" class="chat-timestamp">' + date.toLocaleTimeString() + '</span> ';
-        message = "<div>" + S(prefix + message).stripTags('p').s + "</div>";
+
+        var prefix = '<span class="chat-timestamp">' + date.toLocaleTimeString() + '</span> ';
+        message = '<li>' + S(prefix + message).stripTags('p').s + '</li>';
 
 		chatContent.append(message);
 		scrollToBottom(chatContent);
diff --git a/public/templates/chat.tpl b/public/templates/chat.tpl
index 612bbcd018..d6e2364288 100644
--- a/public/templates/chat.tpl
+++ b/public/templates/chat.tpl
@@ -7,7 +7,7 @@
 				<h4>[[modules:chat.chatting_with]]</h4>
 			</div>
 			<div class="modal-body">
-                <div id="chat-content" class="well well-sm" style="height:250px; overflow-y:scroll; font-size: 14px;"></div>
+                <ul id="chat-content" class="well well-sm"></ul>
                 <div class="input-group">
                     <input id="chat-message-input" type="text" placeholder="[[modules:chat.placeholder]]" name="chat-message" class="form-control">
                     <span class="input-group-btn">