diff --git a/public/language/en-GB/notifications.json b/public/language/en-GB/notifications.json
index 50214f3f95..70bc156f63 100644
--- a/public/language/en-GB/notifications.json
+++ b/public/language/en-GB/notifications.json
@@ -9,8 +9,7 @@
 	"outgoing_link_message": "You are now leaving %1",
 	"continue_to": "Continue to %1",
 	"return_to": "Return to %1",
-	"new_notification": "New Notification",
-	"new_notification_from": "You have a new Notification from %1",
+	"new_notification": "You have a new notification",
 	"you_have_unread_notifications": "You have unread notifications.",
 
 	"all": "All",
diff --git a/src/emailer.js b/src/emailer.js
index dbc56b9175..e5ec56ddea 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -246,7 +246,7 @@ Emailer.sendToEmail = function (template, email, language, params, callback) {
 				to: email,
 				from: meta.config['email:from'] || 'no-reply@' + getHostname(),
 				from_name: meta.config['email:from_name'] || 'NodeBB',
-				subject: '[' + meta.config.title + '] ' + results.subject,
+				subject: '[' + meta.config.title + '] ' + _.unescape(results.subject),
 				html: results.html,
 				plaintext: htmlToText.fromString(results.html, {
 					ignoreImage: true,
diff --git a/src/notifications.js b/src/notifications.js
index 0e6b6865da..fbcc978e18 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -243,7 +243,7 @@ function pushToUids(uids, notification, callback) {
 		async.eachLimit(uids, 3, function (uid, next) {
 			emailer.send('notification', uid, {
 				path: notification.path,
-				subject: utils.stripHTMLTags(notification.subject || '[[notifications:new_notification_from, ' + meta.config.title + ']]'),
+				subject: utils.stripHTMLTags(notification.subject || '[[notifications:new_notification]]'),
 				intro: utils.stripHTMLTags(notification.bodyShort),
 				body: notification.bodyLong || '',
 				notification: notification,