diff --git a/includes/mimemail.rules.inc b/includes/mimemail.rules.inc
index 8e91685..a0b04bd 100644
--- a/includes/mimemail.rules.inc
+++ b/includes/mimemail.rules.inc
@@ -42,7 +42,7 @@ function mimemail_rules_action_mail_to_user($user, $settings) {
   $settings = mimemail_rules_form_settings_process($settings);
   $from = $settings['from'];
   $subject = $settings['subject'];
-  $body = $settings['message_html'];
+  $body = $settings['message_html_filter']['message_html'];
   $plaintext = $settings['message_plaintext'];
   $attachments = $settings['attachments'];
   $mailkey = 'mimemail_rules_action_mail';
@@ -94,7 +94,7 @@ function mimemail_rules_action_mail_to_users_of_role($settings) {
   $settings = mimemail_rules_form_settings_process($settings);
   $from = $settings['from'];
   $subject = $settings['subject'];
-  $body = $settings['message_html'];
+  $body = $settings['message_html_filter']['message_html'];
   $plaintext = $settings['message_plaintext'];
   $attachments = $settings['attachments'];
   $mailkey = 'mimemail_rules_action_role_mail';
diff --git a/includes/mimemail.rules_forms.inc b/includes/mimemail.rules_forms.inc
index fc3a873..0790739 100644
--- a/includes/mimemail.rules_forms.inc
+++ b/includes/mimemail.rules_forms.inc
@@ -25,7 +25,7 @@ function mimemail_rules_action_mail_to_user_form($settings = array(), &$form) {
     '#default_value' => $settings['subject'],
     '#description' => t("The mail's subject."),
   );
-  $form['settings']['message_html'] = array(
+  $form['settings']['message_html_filter']['message_html'] = array(
     '#type' => 'textarea',
     '#title' => t('HTML message'),
     '#default_value' => $settings['message_html'],
@@ -43,6 +43,8 @@ function mimemail_rules_action_mail_to_user_form($settings = array(), &$form) {
     '#default_value' => $settings['attachments'],
     '#description' => t('A list of attachments, one file per line like [mimetype]:[path] e.g. "image/png:/files/images/mypic.png".'),
   );
+
+  $form['settings']['message_html_filter']['format'] = filter_form(variable_get('mimemail_format', FILTER_FORMAT_DEFAULT));
 }
 
 /**
