--- mailhandler.module.orig	2007-07-28 17:44:15.000000000 +0000
+++ mailhandler.module	2008-03-10 18:57:44.000000000 +0000
@@ -119,7 +119,9 @@
  */
 function mailhandler_comment_submit($node, $header, $mailbox, $origbody) {
   if (!$node->subject) $node->subject = $node->title;
-  if (!$node->comment) $node->comment = $node->body;
+  // We dont want the node's comment setting to be the body of the comment.
+  if (!$node->comment or preg_match('/^\d$/', $node->comment))
+  $node->comment = $node->body;
   // We want the comment to have the email time, not the current time
   $node->timestamp = $node->created;
   // comment_save gets an array