diff --git a/templates/partials/chat_message.tpl b/templates/partials/chat_message.tpl
index e3ff58d..b56a2be 100644
--- a/templates/partials/chat_message.tpl
+++ b/templates/partials/chat_message.tpl
@@ -1,4 +1,4 @@
-				<li class="chat-message clear" data-uid="{messages.fromuid}" data-self="{messages.self}" data-break="{messages.newSet}">
+				<li component="chat/message" class="chat-message clear" data-mid="{../messageId}" data-uid="{messages.fromuid}" data-self="{messages.self}" data-break="{messages.newSet}">
 					<div class="message-header">
 						<a href="{config.relative_path}/user/{messages.fromUser.userslug}">
 							<!-- IF messages.fromUser.picture -->
@@ -10,5 +10,10 @@
 						<strong><span class="chat-user">{messages.fromUser.username}</span></strong>
 						<span class="chat-timestamp timeago" title="{messages.timestampISO}"></span>
 					</div>
-					<div class="message-body">{messages.content}</div>
+					<div component="chat/message/body" class="message-body">
+						<!-- IF ../edited -->
+						<small class="text-muted pull-right" title="[[global:edited]] {../editedISO}"><i class="fa fa-edit"></i></span></small>
+						<!-- ENDIF ../edited -->
+						{messages.content}
+					</div>
 				</li>
\ No newline at end of file