diff --git a/mailcomment.module b/mailcomment.module
index 62114cbd92f706072ebc9bb26eea5c1d5209964c..f72050c9ac54c4d832bc529324507a718c2b4202 100644
--- a/mailcomment.module
+++ b/mailcomment.module
@@ -431,7 +431,7 @@ function mailcomment_feeds_parser_sources_alter(&$sources, $content_type) {
  */
 function mailcomment_source_get_source($source, FeedsParserResult $result, $key) {
   $item = $result->currentItem();
-  $identifier = _mailcomment_get_signature(rawurldecode($item['origbody']));
+  $identifier = _mailcomment_get_signature(rawurldecode($item['body_html']));
   if (!$identifier) {
     // Failed to find signature in body -- replicate mailhandler functionality to find node->threading
     if (!empty($item['header']->references)) {
@@ -532,12 +532,12 @@ function mailcomment_feeds_after_parse(FeedsSource $source, FeedsParserResult $r
   switch (variable_get('mailcomment_import_filter_mode', 0)) {
     case MAILCOMMENT_FILTER_BASIC:
       foreach ($result->items as &$message) {
-        $message['origbody'] = _mailcomment_filter_basic($message['origbody']);
+        $message['body_html'] = _mailcomment_filter_basic($message['body_html']);
       }
       break;
     case MAILCOMMENT_FILTER_AGGRESSIVE:
       foreach ($result->items as &$message) {
-        $message['origbody'] = _mailcomment_filter_aggressive($message['origbody']);
+        $message['body_html'] = _mailcomment_filter_aggressive($message['body_html']);
       }
       break;
   }
diff --git a/mailcomment_default/mailcomment_default.feeds_importer_default.inc b/mailcomment_default/mailcomment_default.feeds_importer_default.inc
index 320e51f143432b15294a517a8ba193132a1231a8..97ecfd322c8e83198423410d7c375cdb675aba66 100644
--- a/mailcomment_default/mailcomment_default.feeds_importer_default.inc
+++ b/mailcomment_default/mailcomment_default.feeds_importer_default.inc
@@ -58,7 +58,7 @@ function mailcomment_default_feeds_importer_default() {
             'unique' => FALSE,
           ),
           3 => array(
-            'source' => 'origbody',
+            'source' => 'body_html',
             'target' => 'comment',
             'unique' => FALSE,
           ),
diff --git a/plugins/authenticate_plugin/MailcommentAuthenticate.class.php b/plugins/authenticate_plugin/MailcommentAuthenticate.class.php
index 2695d8e504c6f792a5edceb02365a678f081a0ca..0f1480d15da2907c46495dbb3b798e5bb71defdc 100644
--- a/plugins/authenticate_plugin/MailcommentAuthenticate.class.php
+++ b/plugins/authenticate_plugin/MailcommentAuthenticate.class.php
@@ -12,7 +12,7 @@ class MailcommentAuthenticate extends MailhandlerAuthenticate {
   public function authenticate(&$message, $mailbox) {
     // Check and parse messageid for parameters.  URL will be encoded.
     $force_user_lookup = FALSE;
-    $identifier = _mailcomment_get_signature(rawurldecode($message['origbody']));
+    $identifier = _mailcomment_get_signature(rawurldecode($message['body_html']));
     // Failed to find signature in body -- replicate mailhandler functionality to find node->threading
     if (!$identifier) {
       if (!empty($message['header']->references)) {