From b2bf44c345589b542cb091f099d63c0fbdcca894 Mon Sep 17 00:00:00 2001
From: Ivan Fedorov <inbox@titaniumhocker.ru>
Date: Fri, 29 Apr 2022 18:24:25 +0300
Subject: [PATCH 1/2] Added X-Mailer header to outgoing emails * This header
 makes emails filtering easier

---
 server/core/mail.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/core/mail.js b/server/core/mail.js
index 0089c3bc73..c6feaff7bb 100644
--- a/server/core/mail.js
+++ b/server/core/mail.js
@@ -51,6 +51,9 @@ module.exports = {
     }
     await this.loadTemplate(opts.template)
     return this.transport.sendMail({
+      headers: {
+        'x-mailer': 'WikiJS'
+      },
       from: `"${WIKI.config.mail.senderName}" <${WIKI.config.mail.senderEmail}>`,
       to: opts.to,
       subject: `${opts.subject} - ${WIKI.config.title}`,

From c468bdd1e6d1942519bc11e462149d35537937c4 Mon Sep 17 00:00:00 2001
From: Nicolas Giard <github@ngpixel.com>
Date: Fri, 29 Apr 2022 18:59:34 -0400
Subject: [PATCH 2/2] fix: x-mailer formatting

---
 server/core/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/core/mail.js b/server/core/mail.js
index c6feaff7bb..9dad973a9d 100644
--- a/server/core/mail.js
+++ b/server/core/mail.js
@@ -52,7 +52,7 @@ module.exports = {
     await this.loadTemplate(opts.template)
     return this.transport.sendMail({
       headers: {
-        'x-mailer': 'WikiJS'
+        'x-mailer': 'Wiki.js'
       },
       from: `"${WIKI.config.mail.senderName}" <${WIKI.config.mail.senderEmail}>`,
       to: opts.to,