From 9e44fc6ae21c2798d0b4f6a5883b302af977b2e9 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 20 Mar 2018 08:41:49 -0400
Subject: [PATCH] fixes #6371

---
 src/emailer.js         | 2 +-
 src/socket.io/admin.js | 3 +--
 src/user/digest.js     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/emailer.js b/src/emailer.js
index 2419b7ea2b..db49bdf0f8 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -229,7 +229,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: results.subject,
+				subject: '[' + meta.config.title + '] ' + results.subject,
 				html: results.html,
 				plaintext: htmlToText.fromString(results.html, {
 					ignoreImage: true,
diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index 668dea0dbc..95bb430069 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -228,9 +228,8 @@ SocketAdmin.settings.clearSitemapCache = function (socket, data, callback) {
 };
 
 SocketAdmin.email.test = function (socket, data, callback) {
-	var site_title = meta.config.title || 'NodeBB';
 	var payload = {
-		subject: '[' + site_title + '] Test Email',
+		subject: 'Test Email',
 	};
 
 	switch (data.template) {
diff --git a/src/user/digest.js b/src/user/digest.js
index 876e1b7a07..3c74fcdfaa 100644
--- a/src/user/digest.js
+++ b/src/user/digest.js
@@ -134,7 +134,7 @@ Digest.send = function (data, callback) {
 						});
 						emailsSent += 1;
 						emailer.send('digest', userObj.uid, {
-							subject: '[' + meta.config.title + '] [[email:digest.subject, ' + (now.getFullYear() + '/' + (now.getMonth() + 1) + '/' + now.getDate()) + ']]',
+							subject: '[[email:digest.subject, ' + (now.getFullYear() + '/' + (now.getMonth() + 1) + '/' + now.getDate()) + ']]',
 							username: userObj.username,
 							userslug: userObj.userslug,
 							notifications: notifications,