diff --git a/src/messaging.js b/src/messaging.js
index f6cc6671c0..6f2c54de28 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -56,13 +56,16 @@ var db = require('./database'),
 
 				var messages = [];
 
+				userData[0].uid = touid;
+				userData[1].uid = fromuid;
+
 				function getMessage(mid, next) {
 					db.getObject('message:' + mid, function(err, message) {
 						if (err) {
 							return next(err);
 						}
 
-						Messaging.parse(message.content, message.fromuid, fromuid, userData[1], userData[0], function(result) {
+						Messaging.parse(message.content, message.fromuid, fromuid, userData[1], userData[0], false, function(result) {
 							message.content = result;
 							messages.push(message);
 							next(null);
@@ -81,7 +84,7 @@ var db = require('./database'),
 		});
 	};
 
-	Messaging.parse = function (message, fromuid, myuid, toUserData, myUserData, callback) {
+	Messaging.parse = function (message, fromuid, myuid, toUserData, myUserData, isNew, callback) {
 		plugins.fireHook('filter:post.parse', message, function(err, parsed) {
 			if (err) {
 				return callback(message);
@@ -104,6 +107,7 @@ var db = require('./database'),
 				myuid: myuid,
 				toUserData: toUserData,
 				myUserData: myUserData,
+				isNew: isNew,
 				parsedMessage: picture + username + parsed
 			};
 
diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index d59a18425b..4a89b32ff4 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -109,7 +109,11 @@ SocketModules.chats.send = function(socket, data) {
 				});
 			});
 		}
-        Messaging.parse(msg, socket.uid, socket.uid, usersData[1], usersData[0], function(parsed) {
+
+		usersData[0].uid = socket.uid;
+		usersData[1].uid = touid;
+
+        Messaging.parse(msg, socket.uid, socket.uid, usersData[1], usersData[0], true, function(parsed) {
             Messaging.addMessage(socket.uid, touid, msg, function(err, message) {
                 var numSockets = 0,
                     x;