diff -Naur subscriptions.install subscriptions.install
--- subscriptions.install	2012-02-22 09:35:42.000000000 -0800
+++ subscriptions.install	2012-03-10 12:35:50.000000000 -0800
@@ -134,6 +134,7 @@
   variable_del('subscriptions_form_in_block');
   variable_del('subscriptions_form_link_only');
   variable_del('subscriptions_generate_full_node');
+  variable_del('subscriptions_allow_html_node_output');
   variable_del('subscriptions_hide_overview_page');
   variable_del('subscriptions_link_teaser');
   variable_del('subscriptions_omitted_taxa');
diff -Naur subscriptions_content.module subscriptions_content.module
--- subscriptions_content.module	2012-02-22 09:35:42.000000000 -0800
+++ subscriptions_content.module	2012-03-10 13:33:20.000000000 -0800
@@ -345,6 +345,13 @@
     '#description'   => t('Nodes of %Static_content_types may end up with no %Subscribe options at all. Turn this option on to avoid displaying %Subscribe links in this case. The default is OFF, because this option causes processing overhead for each node view operation.', array('%Static_content_types' => t('Static content types'), '%Subscribe' => t('Subscribe'))),
   );
 
+  $form['content']['subscriptions_allow_html_node_output'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Allow full HTML node body output'),
+    '#default_value' => variable_get('subscriptions_allow_html_node_output', 0),
+    '#description'   => t('Node body output is stripped of all HTML tags normally. Checking this box will allow HTML tags from the node body to pass through.'),
+  );
+
   $form['content']['subscriptions_generate_full_node'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Generate the %full_node variable', array('%full_node' => '!full_node')),
@@ -606,7 +613,14 @@
  */
 function _subscriptions_content_node_mailvars(&$mailvars, $node, $field, $s) {
   global $language;
-  include_once drupal_get_path('module', 'subscriptions_mail') .'/subscriptions_mail.templates.inc';
+
+global $theme_path;
+if (is_file($theme_path .'/subscriptions_mail.templates.inc')) {
+   include_once $theme_path .'/subscriptions_mail.templates.inc';
+}
+else {
+   include_once drupal_get_path('module', 'subscriptions_mail') .'/subscriptions_mail.templates.inc';
+}
 
   $mailvars['!url'] = url('node/'. $node->nid, array('absolute' => TRUE));
   $mailvars['!node_type'] = $node->type;
@@ -671,7 +685,9 @@
   if (isset($format)) {
     $text = check_markup($text, $format, FALSE);
   }
-  $text = drupal_html_to_text($text);
+  if (!variable_get('subscriptions_allow_html_node_output', 0)) {
+    $text = drupal_html_to_text($text);
+  }
   return trim($text);
 }
 
diff -Naur subscriptions_mail.cron.inc subscriptions_mail.cron.inc
--- subscriptions_mail.cron.inc	2012-02-22 09:35:42.000000000 -0800
+++ subscriptions_mail.cron.inc	2012-03-10 13:33:20.000000000 -0800
@@ -16,7 +16,14 @@
 
   global $user, $language;
   drupal_init_language();
-  include_once drupal_get_path('module', 'subscriptions_mail') .'/subscriptions_mail.templates.inc';
+
+global $theme_path;
+if (is_file($theme_path .'/subscriptions_mail.templates.inc')) {
+   include_once $theme_path .'/subscriptions_mail.templates.inc';
+}
+else {
+   include_once drupal_get_path('module', 'subscriptions_mail') .'/subscriptions_mail.templates.inc';
+}
 
   $mails_allowed = variable_get('subscriptions_number_of_mails', 0);
   $from = _subscriptions_mail_site_mail();
diff -Naur subscriptions_mail.module subscriptions_mail.module
--- subscriptions_mail.module	2012-02-22 09:35:42.000000000 -0800
+++ subscriptions_mail.module	2012-03-10 13:33:20.000000000 -0800
@@ -162,7 +162,15 @@
  * @ingroup hooks
  */
 function subscriptions_mail_mail_edit_text($mailkey, $language) {
-  include_once drupal_get_path('module', 'subscriptions_mail') .'/subscriptions_mail.templates.inc';
+
+global $theme_path;
+if (is_file($theme_path .'/subscriptions_mail.templates.inc')) {
+   include_once $theme_path .'/subscriptions_mail.templates.inc';
+}
+else {
+   include_once drupal_get_path('module', 'subscriptions_mail') .'/subscriptions_mail.templates.inc';
+}
+
   $return = array();
   $return['subject'] = subscriptions_mail_template('DSUBJ', $language->language);
   $return['body'] = subscriptions_mail_template('DBODY', $language->language);
@@ -177,7 +185,15 @@
  * @ingroup hooks
  */
 function subscriptions_mail_subscriptions_mail_text($mailkey, $language) {
-  include_once drupal_get_path('module', 'subscriptions_mail') .'/subscriptions_mail.templates.inc';
+
+global $theme_path;
+if (is_file($theme_path .'/subscriptions_mail.templates.inc')) {
+   include_once $theme_path .'/subscriptions_mail.templates.inc';
+}
+else {
+   include_once drupal_get_path('module', 'subscriptions_mail') .'/subscriptions_mail.templates.inc';
+}
+
   $return = array();
   $return['subject'] = subscriptions_mail_template('SUBJ', $language->language);
   $return['body'] = subscriptions_mail_template('BODY', $language->language);