--- mailhandler.module.orig	2010-06-04 09:16:12.000000000 -0400
+++ mailhandler.module	2010-11-18 17:40:35.000000000 -0500
@@ -401,7 +401,10 @@ function mailhandler_node_prepare_messag
     mailhandler_node_process_message_commands($node, $commands['commands']);
   }
   // Isolate the body from the commands and the sig
-  $tmp = array_slice($commands['lines'], $commands['endcommands'], $commands['i'] - $commands['endcommands']);
+  $tmp = $commands['lines'];
+  for ($i = 1; $i <= $commands['endcommands']; $i++) {
+    array_shift($tmp);
+  }
   // flatten and assign the body to node object. note that filter() is called within node_save() [tested with blog post]
   $type = node_get_types('type', $node->type);
   if ($type->has_body) {
