diff --git a/core/server/services/mail/GhostMailer.js b/core/server/services/mail/GhostMailer.js
index 38787bfa3e..d8be219f5e 100644
--- a/core/server/services/mail/GhostMailer.js
+++ b/core/server/services/mail/GhostMailer.js
@@ -36,10 +36,12 @@ function getFromAddress(requestedFromAddress) {
 }
 
 function createMessage(message) {
+    const encoding = 'base64';
+    const generateTextFromHTML = !message.forceTextContent;
     return Object.assign({}, message, {
         from: getFromAddress(message.from),
-        generateTextFromHTML: true,
-        encoding: 'base64'
+        generateTextFromHTML,
+        encoding
     });
 }