diff --git a/src/messaging/notifications.js b/src/messaging/notifications.js
index 3116c31a2b..f0220f2929 100644
--- a/src/messaging/notifications.js
+++ b/src/messaging/notifications.js
@@ -76,6 +76,7 @@ module.exports = function (Messaging) {
 
 				notifications.create({
 					type: 'new-chat',
+					subject: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
 					bodyShort: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
 					bodyLong: messageObj.content,
 					nid: 'chat_' + fromuid + '_' + roomId,
diff --git a/src/topics/follow.js b/src/topics/follow.js
index aad9c0f079..05b98cc95d 100644
--- a/src/topics/follow.js
+++ b/src/topics/follow.js
@@ -220,7 +220,7 @@ module.exports = function (Topics) {
 
 				notifications.create({
 					type: 'new-reply',
-					subject: '[' + (meta.config.title || 'NodeBB') + '] ' + title,
+					subject: title,
 					bodyShort: '[[notifications:user_posted_to, ' + postData.user.username + ', ' + titleEscaped + ']]',
 					bodyLong: postData.content,
 					pid: postData.pid,