diff --git a/client/views/app/chatMessageDashboard.coffee b/client/views/app/chatMessageDashboard.coffee
index 38e8b4f77f586192be37d20bc80c6f8e42850a68..cdbddd720b7d2a40b8640bd8a67a93eb28cb50b2 100644
--- a/client/views/app/chatMessageDashboard.coffee
+++ b/client/views/app/chatMessageDashboard.coffee
@@ -2,14 +2,11 @@ Template.chatMessageDashboard.helpers
 	own: ->
 		return 'own' if this.u?._id is Meteor.userId()
 
-	messageDate: (date) ->
-		return moment(date).format('LL')
-
-	isSystemMessage: ->
-		return this.t in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'nu', 'wm', 'uj']
+	time: ->
+		return moment(this.ts).format('HH:mm')
 
-	isEditing: ->
-		return this._id is Session.get('editingMessageId')
+	date: ->
+		return moment(this.ts).format('LL')
 
 	message: ->
 		switch this.t
@@ -28,8 +25,11 @@ Template.chatMessageDashboard.helpers
 				this.html = message.html.replace /\n/gm, '<br/>'
 				return this.html
 
-	time: ->
-		return moment(this.ts).format('HH:mm')
+	isSystemMessage: ->
+		return this.t in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'nu', 'wm', 'uj']
+
+	isEditing: ->
+		return this._id is Session.get('editingMessageId')
 
 	getPupupConfig: ->
 		template = Template.instance()
diff --git a/client/views/app/chatMessageDashboard.html b/client/views/app/chatMessageDashboard.html
index dc7cb4a86a09085dc26cac0194b5aa989038f063..b2c90ed02dc1fdd2a3aa4eccc5dd3dd1c888cf06 100644
--- a/client/views/app/chatMessageDashboard.html
+++ b/client/views/app/chatMessageDashboard.html
@@ -1,10 +1,10 @@
 <template name="chatMessageDashboard">
 	{{#if ../dateSeparator}}
 		<li class="date">
-			<span>{{messageDate ts}}</span>
+			<span>{{date}}</span>
 		</li>
 	{{/if}}
-	<li id="{{_id}}" class="message {{#if ../single}}sequential{{/if}} {{own}} {{type}}" data-username="{{u.username}}">
+	<li id="{{_id}}" class="message {{#if ../single}}sequential{{/if}} {{own}} {{type}}" data-username="{{u.username}}" data-date="{{date}}">
 		{{#if isSystemMessage}}
 			<p class="system">{{{message}}}</p>
 		{{else}}