diff --git a/public/src/forum/chats.js b/public/src/forum/chats.js
index 273abeb509..5ad1bd6229 100644
--- a/public/src/forum/chats.js
+++ b/public/src/forum/chats.js
@@ -92,7 +92,7 @@ define('forum/chats', ['string', 'sounds'], function(S, sounds) {
 
 			if (Chats.isCurrentChat(data.withUid)) {
 				newMessage = data.self === 0;
-
+				data.message.self = data.self;
 				Chats.parseMessage(data.message, function(html) {
 					var newMessage = $(html);
 					newMessage.insertBefore(typingNotifEl);
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 61a0cb3aec..62221d8cc1 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -63,6 +63,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
 
 			var username = data.message.fromUser.username;
 			var isSelf = parseInt(data.message.fromUser.uid, 10) === parseInt(app.uid, 10);
+			data.message.self = data.self;
 			if (isSelf) {
 				username = data.message.toUser.username;
 			}
diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index a9bdd9fc0f..0be1b64a5b 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -207,7 +207,7 @@ SocketModules.chats.send = function(socket, data, callback) {
 		server.getUserSockets(touid).forEach(function(s) {
 			s.emit('event:chats.receive', {
 				withUid: socket.uid,
-				message: recipMessage,
+				message: message,
 				self: 0
 			});
 		});