Index: modules/webform/webform.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/webform/webform.inc,v
retrieving revision 1.48.2.13
diff -u -r1.48.2.13 webform.inc
--- modules/webform/webform.inc	14 Jun 2007 03:02:11 -0000	1.48.2.13
+++ modules/webform/webform.inc	30 Jun 2007 01:01:10 -0000
@@ -232,7 +232,13 @@
   else {
     $message .= $indent . $node->webformcomponents[$key]['name'] .":\n";
     foreach ($value as $k => $v) {
-      $message .= theme('webform_mail_fields', $k, $v, $node, $indent ."  ");
+      foreach($node->webformcomponents as $local_key => $local_value) {
+        if ($local_value['form_key'] == $k) {
+          $form_key = $local_key;
+          break;
+        }
+      }
+      $message .= theme('webform_mail_fields', $form_key, $v, $node, $indent ."  ");
     }
   }
   return ($message);