diff --git a/src/socket.io/helpers.js b/src/socket.io/helpers.js
index 5524faf156..12a0e9d9b5 100644
--- a/src/socket.io/helpers.js
+++ b/src/socket.io/helpers.js
@@ -16,6 +16,11 @@ var plugins = require('../plugins');
 var SocketHelpers = {};
 
 SocketHelpers.notifyOnlineUsers = function(uid, result) {
+	winston.warn('[deprecated] SocketHelpers.notifyOnlineUsers, consider using socketHelpers.notifyNew(uid, \'newPost\', result);');
+	SocketHelpers.notifyNew(uid, 'newPost', result);
+};
+
+SocketHelpers.notifyNew = function(uid, type, result) {
 	async.waterfall([
 		function(next) {
 			user.getUidsFromSet('users:online', 0, -1, next);
@@ -24,20 +29,23 @@ SocketHelpers.notifyOnlineUsers = function(uid, result) {
 			privileges.topics.filterUids('read', result.posts[0].topic.tid, uids, next);
 		},
 		function(uids, next) {
-			plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: uid, type: 'newPost'}, next);
+			plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: uid, type: type}, next);
 		}
 	], function(err, data) {
 		if (err) {
 			return winston.error(err.stack);
 		}
 
-		var uids = data.uidsTo;
+		result.posts[0].ip = undefined;
 
-		for(var i=0; i<uids.length; ++i) {
-			if (parseInt(uids[i], 10) !== uid) {
-				websockets.in('uid_' + uids[i]).emit('event:new_post', result);
+		data.uidsTo.forEach(function(toUid) {
+			if (parseInt(toUid, 10) !== uid) {
+				websockets.in('uid_' + toUid).emit('event:new_post', result);
+				if (result.topic && type === 'newTopic') {
+					websockets.in('uid_' + toUid).emit('event:new_topic', result.topic);
+				}
 			}
-		}
+		});
 	});
 };
 
diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js
index b0384820ea..5e31e0c611 100644
--- a/src/socket.io/posts.js
+++ b/src/socket.io/posts.js
@@ -51,7 +51,7 @@ SocketPosts.reply = function(socket, data, callback) {
 
 		user.updateOnlineUsers(socket.uid);
 
-		socketHelpers.notifyOnlineUsers(socket.uid, result);
+		socketHelpers.notifyNew(socket.uid, 'newPost', result);
 
 		if (data.lock) {
 			socketTopics.doTopicAction('lock', 'event:topic_locked', socket, {tids: [postData.topic.tid], cid: postData.topic.cid});
diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js
index 72e6e7c510..c96a77265e 100644
--- a/src/socket.io/topics.js
+++ b/src/socket.io/topics.js
@@ -2,14 +2,12 @@
 'use strict';
 
 var async = require('async');
-var winston = require('winston');
 
 var topics = require('../topics');
-var privileges = require('../privileges');
-var plugins = require('../plugins');
 var websockets = require('./index');
 var user = require('../user');
 var apiController = require('../controllers/api');
+var socketHelpers = require('./helpers');
 
 var SocketTopics = {};
 
@@ -43,33 +41,11 @@ SocketTopics.post = function(socket, data, callback) {
 		}
 
 		callback(null, result.topicData);
+
 		socket.emit('event:new_post', {posts: [result.postData]});
 		socket.emit('event:new_topic', result.topicData);
 
-		async.waterfall([
-			function(next) {
-				user.getUidsFromSet('users:online', 0, -1, next);
-			},
-			function(uids, next) {
-				privileges.categories.filterUids('read', result.topicData.cid, uids, next);
-			},
-			function(uids, next) {
-				plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: data.uid, type: 'newTopic'}, next);
-			}
-		], function(err, data) {
-			if (err) {
-				return winston.error(err.stack);
-			}
-
-			var uids = data.uidsTo;
-
-			for(var i=0; i<uids.length; ++i) {
-				if (parseInt(uids[i], 10) !== socket.uid) {
-					websockets.in('uid_' + uids[i]).emit('event:new_post', {posts: [result.postData]});
-					websockets.in('uid_' + uids[i]).emit('event:new_topic', result.topicData);
-				}
-			}
-		});
+		socketHelpers.notifyNew(socket.uid, 'newTopic', {posts: [result.postData], topic: result.topicData});
 	});
 };