diff --git a/doc/Extensions/Alerting.md b/doc/Extensions/Alerting.md
index 6ce8431f8..09e269dd9 100644
--- a/doc/Extensions/Alerting.md
+++ b/doc/Extensions/Alerting.md
@@ -178,6 +178,7 @@ $config['email_backend']                   = 'mail';               // Mail backe
 $config['email_from']                      = NULL;                 // Mail from. Default: "ProjectName" <projectid@`hostname`>
 $config['email_user']                      = $config['project_id'];
 $config['email_sendmail_path']             = '/usr/sbin/sendmail'; // The location of the sendmail program.
+$config['email_html']                      = FALSE;                // Whether to send HTML email as opposed to plaintext
 $config['email_smtp_host']                 = 'localhost';          // Outgoing SMTP server name.
 $config['email_smtp_port']                 = 25;                   // The port to connect.
 $config['email_smtp_timeout']              = 10;                   // SMTP connection timeout in seconds.
diff --git a/html/pages/settings/alerting.inc.php b/html/pages/settings/alerting.inc.php
index 243f98a7d..f9a2b5078 100644
--- a/html/pages/settings/alerting.inc.php
+++ b/html/pages/settings/alerting.inc.php
@@ -248,6 +248,10 @@ $mail_conf = array(
           'descr'              => 'From email address',
           'type'               => 'text',
     ),
+    array('name'               => 'email_html',
+          'descr'              => 'Use HTML emails',
+          'type'               => 'checkbox',
+    ),
     array('name'               => 'email_sendmail_path',
           'descr'              => 'Sendmail path',
           'type'               => 'text',
diff --git a/includes/alerts/transport.mail.php b/includes/alerts/transport.mail.php
index 56608aa69..41a65930f 100644
--- a/includes/alerts/transport.mail.php
+++ b/includes/alerts/transport.mail.php
@@ -21,4 +21,4 @@
  * @subpackage Alerts
  */
 
-return send_mail($obj['contacts'], $obj['title'], $obj['msg'], $opts['html'] ? true : false );
+return send_mail($obj['contacts'], $obj['title'], $obj['msg'], ($config['email_html'] == 'true') ? true : false );
diff --git a/sql-schema/108.sql b/sql-schema/108.sql
new file mode 100644
index 000000000..670badd78
--- /dev/null
+++ b/sql-schema/108.sql
@@ -0,0 +1 @@
+INSERT INTO config (config_name,config_value,config_default,config_descr,config_group,config_group_order,config_sub_group,config_sub_group_order,config_hidden,config_disabled) values ('email_html', 'false', 'false', 'Send HTML emails', 'alerting',0,'general',0,'0','0');