--- sites/all/modules/webform/webform.module	do sep  1 22:39:00 2011
+++ sites/all/modules/webform/webform.module	do sep  1 22:39:52 2011
@@ -3430,7 +3430,12 @@
 function webform_email_html_capable() {
   // The D7 version of this function is much more capable. This function exists
   // as a wrapper for consistency in the rest of Webform.
-  return module_exists('mimemail');
+  if (module_exists('mimemail') or module_exists('htmlmail')) {
+    return TRUE;
+  }
+  else {
+    return FALSE;
+  }
 }
 
 /**
