diff --git a/public/src/forum/chats.js b/public/src/forum/chats.js
index 6d4e0ed65a..273abeb509 100644
--- a/public/src/forum/chats.js
+++ b/public/src/forum/chats.js
@@ -91,7 +91,7 @@ define('forum/chats', ['string', 'sounds'], function(S, sounds) {
 				containerEl = $('.expanded-chat ul');
 
 			if (Chats.isCurrentChat(data.withUid)) {
-				newMessage = data.message.self === 0;
+				newMessage = data.self === 0;
 
 				Chats.parseMessage(data.message, function(html) {
 					var newMessage = $(html);
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 8b6d1fe941..61a0cb3aec 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -66,7 +66,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
 			if (isSelf) {
 				username = data.message.toUser.username;
 			}
-			newMessage = data.message.self === 0;
+			newMessage = data.self === 0;
 			if (module.modalExists(data.withUid)) {
 				var modal = module.getModal(data.withUid);
 				module.appendChatMessage(modal, data.message);
diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index 1156b1c379..a9bdd9fc0f 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -202,16 +202,13 @@ SocketModules.chats.send = function(socket, data, callback) {
 
 		sendChatNotification(socket.uid, touid, message);
 
-		// After-the-fact fixing of the "self" property for the message that goes to the receipient
-		var recipMessage = JSON.parse(JSON.stringify(message));
-		recipMessage.self = 0;
-
 		// Recipient
 		SocketModules.chats.pushUnreadCount(touid);
 		server.getUserSockets(touid).forEach(function(s) {
 			s.emit('event:chats.receive', {
 				withUid: socket.uid,
-				message: recipMessage
+				message: recipMessage,
+				self: 0
 			});
 		});
 
@@ -220,7 +217,8 @@ SocketModules.chats.send = function(socket, data, callback) {
 		server.getUserSockets(socket.uid).forEach(function(s) {
 			s.emit('event:chats.receive', {
 				withUid: touid,
-				message: message
+				message: message,
+				self: 1
 			});
 		});
 	});