diff --git a/src/messaging.js b/src/messaging.js
index c7e13e72bb..8864368c11 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -264,7 +264,7 @@ Messaging.canMessageUser = function (uid, toUid, callback) {
 				return next(new Error('[[error:chat-restricted]]'));
 			}
 
-			plugins.fireHook('filter:messaging.canMessageUser', {
+			plugins.fireHook('static:messaging.canMessageUser', {
 				uid: uid,
 				toUid: toUid,
 			}, function (err) {
@@ -306,7 +306,12 @@ Messaging.canMessageRoom = function (uid, roomId, callback) {
 				return next(new Error('[[error:email-not-confirmed-chat]]'));
 			}
 
-			next();
+			plugins.fireHook('static:messaging.canMessageRoom', {
+				uid: uid,
+				roomId: roomId,
+			}, function (err) {
+				next(err);
+			});
 		},
 	], callback);
 };
diff --git a/src/messaging/data.js b/src/messaging/data.js
index 6a3a7b03a4..b565294902 100644
--- a/src/messaging/data.js
+++ b/src/messaging/data.js
@@ -130,7 +130,7 @@ module.exports = function (Messaging) {
 				}
 			},
 			function (messages, next) {
-				plugins.fireHook('filter:messaging.getMessagesData', {
+				plugins.fireHook('filter:messaging.getMessages', {
 					messages: messages,
 					uid: uid,
 					roomId: roomId,
diff --git a/src/messaging/notifications.js b/src/messaging/notifications.js
index 564ea01fee..9e223a8158 100644
--- a/src/messaging/notifications.js
+++ b/src/messaging/notifications.js
@@ -28,7 +28,7 @@ module.exports = function (Messaging) {
 					message: messageObj,
 				};
 
-				plugins.fireHook('filter:messaging.notifyUsersInRoom', data, next);
+				plugins.fireHook('filter:messaging.notify', data, next);
 			},
 			function (data, next) {
 				if (!data || !data.uids || !data.uids.length) {