diff --git a/upload/system/library/mail/mail.php b/upload/system/library/mail/mail.php
index ff4aec689..c25a5c1d5 100644
--- a/upload/system/library/mail/mail.php
+++ b/upload/system/library/mail/mail.php
@@ -69,7 +69,7 @@ public function send(): bool {
 			if (!empty($this->option['text'])) {
 				$message .= chunk_split(base64_encode($this->option['text']), 950) . $eol;
 			} else {
-				$message .= chunk_split(base64_encode('This is a HTML email and your email client software does not support HTML email!'), 950) . $eol;
+				$message .= chunk_split(base64_encode(strip_tags($this->option['html'])), 950) . $eol;
 			}
 
 			$message .= '--' . $boundary . '_alt' . $eol;
diff --git a/upload/system/library/mail/smtp.php b/upload/system/library/mail/smtp.php
index 6e937662f..ad9ce1d5a 100644
--- a/upload/system/library/mail/smtp.php
+++ b/upload/system/library/mail/smtp.php
@@ -101,7 +101,7 @@ public function send(): bool {
 			if (!empty($this->option['text'])) {
 				$message .= chunk_split(base64_encode($this->option['text']), 950) . PHP_EOL;
 			} else {
-				$message .= chunk_split(base64_encode('This is a HTML email and your email client software does not support HTML email!'), 950) . PHP_EOL;
+				$message .= chunk_split(base64_encode(strip_tags($this->option['html'])), 950) . PHP_EOL;
 			}
 
 			$message .= '--' . $boundary . '_alt' . PHP_EOL;