diff --git a/mailcomment.module b/mailcomment.module
index 037c378..cb2799b 100644
--- a/mailcomment.module
+++ b/mailcomment.module
@@ -537,15 +537,17 @@ function mailcomment_signature($params) {
 // Need to clean up body text after the comment is parsed and before it is processed
 function mailcomment_feeds_after_parse(FeedsImporter $importer, FeedsSource $source) {
   // Now trim out the rest of the message if separator text exists
-  // @ TODO May fail for html mails
+  // @ TODO May fail for html mails 
   if ($marker = variable_get('mailcomment_reply_text', t('((( Reply ABOVE this LINE to POST a COMMENT )))'))) {
     // Allow other modules to act on the text and node object before we start stripping things from it.
-    mailcomment_invoke_mailcomment_alter($node, 'pre');
-    // Now the dirty part. May need some more clean up for line endings, spare html, etc...
-    $pos = strpos($node->body, $marker);
-    if ($pos !== FALSE) {
-      // Mailhandler brings this in as a full node with teaser/body but we need to change context to comment
-      $node->body = drupal_substr($node->body, 0, $pos);
+    //mailcomment_invoke_mailcomment_alter($node, 'pre');
+    $count = 0; // Initialize counter for batch items
+    foreach ($source->batch->items as $message) {
+      $pos = strpos($message['origbody'], $marker);
+      if ($pos !== FALSE) {
+        $source->batch->items[$count]['origbody'] = drupal_substr($message['origbody'], 0, $pos);
+      }
+      $count++;
     }
   }
 }