diff --git a/client/views/msg.tpl b/client/views/msg.tpl
index 64ec97e7..8b1d1d0e 100644
--- a/client/views/msg.tpl
+++ b/client/views/msg.tpl
@@ -1,4 +1,4 @@
-<div class="msg {{type}}{{#if self}} self{{/if}}{{#if highlight}} highlight{{/if}}" id="msg-{{id}}" data-time="{{time}}" data-from="{{from}}">
+<div class="msg {{type}}{{#if self}} self{{/if}}{{#if highlight}} highlight{{/if}}" id="msg-{{id}}" data-time="{{time}}"{{#if from.nick}} data-from="{{from.nick}}"{{/if}}>
 	<span class="time tooltipped tooltipped-e" aria-label="{{localetime time}}">
 		{{tz time}}
 	</span>
diff --git a/client/views/msg_action.tpl b/client/views/msg_action.tpl
index 42eb385f..56f796a5 100644
--- a/client/views/msg_action.tpl
+++ b/client/views/msg_action.tpl
@@ -1,5 +1,5 @@
 <div class="msg {{type}}{{#if self}} self{{/if}}{{#if highlight}} highlight{{/if}}"
-	data-type="{{type}}" id="msg-{{id}}" data-time="{{time}}">
+	data-type="{{type}}" id="msg-{{id}}" data-time="{{time}}"{{#if from.nick}} data-from="{{from.nick}}"{{/if}}>
 	<span class="time tooltipped tooltipped-e" aria-label="{{localetime time}}">
 		{{tz time}}
 	</span>