--- webform.inc.orig	2007-07-27 15:53:00.000000000 -0400
+++ webform.inc	2007-09-27 11:48:05.000000000 -0400
@@ -206,6 +206,13 @@
 }
 
 function theme_webform_mail_fields($key, $value, $node, $indent = "") {
+  // Replace key by cid
+  foreach ($node->webformcomponents as $cid => $component) {
+    if ($key == $component['form_key']) {
+      $key = $cid;
+      break;
+    }
+  }
   // First check for component-level themes.
   $themed_output = theme("webform_mail_". $node->webformcomponents[$key]['type'], $value, $node->webformcomponents[$key]);
   if ($themed_output) {