1 files changed, 8 insertions, 0 deletions
diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php
index 9744fa44e..f04cdd3e2 100644
--- a/inc/Mailer.class.php
+++ b/inc/Mailer.class.php
@@ -26,6 +26,7 @@ class Mailer {
     private $sendparam= null;
 
     private $validator = null;
+    private $allowhtml = true;
 
     /**
      * Constructor
@@ -43,6 +44,8 @@ class Mailer {
         $listid = join('.',array_reverse(explode('/',DOKU_BASE))).$server;
         $listid = strtolower(trim($listid,'.'));
 
+        $this->allowhtml = (bool) $conf['htmlmail'];
+
         // add some default headers for mailfiltering FS#2247
         $this->setHeader('X-Mailer','DokuWiki '.getVersion());
         $this->setHeader('X-DokuWiki-User', $_SERVER['REMOTE_USER']);
@@ -434,6 +437,11 @@ class Mailer {
     protected function prepareBody(){
         global $conf;
 
+        // no HTML mails allowed? remove HTML body
+        if(!$this->allowhtml){
+            $this->html = '';
+        }
+
         // check for body
         if(!$this->text && !$this->html){
             return false;