Merge pull request #4245 from pichalite/issue-4159

fixes #4159

public/src/client/chats.js

@@ -394,10 +394,8 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
 			data.messages.forEach(function(message) {
 				var self = parseInt(message.fromuid, 10) === parseInt(app.user.uid);
 				message.self = self ? 1 : 0;
-				templates.parse('partials/chat_message', {
+				Chats.parseMessage(message, function(html) {
-					messages: message
+				    var body = components.get('chat/message', message.messageId);
-				}, function(html) {
-					var body = components.get('chat/message', message.messageId);
 					if (body.length) {
 						body.replaceWith(html);
 						components.get('chat/message', message.messageId).find('.timeago').timeago();