--- webform.inc.1.7	2007-12-03 10:09:13.000000000 +0100
+++ webform.inc	2007-12-03 10:11:37.000000000 +0100
@@ -184,7 +184,7 @@
 
   $message .= "\n";
   $message .= t('Submitted values are');
-  $message .= theme('webform_mail_fields', '', $form_values['submitted_tree'], $node);
+  $message .= theme('webform_mail_fields', '', $form_values['submitted'], $node);
 
   $message .= "\n\n";
   $message .= t("The results of this submission may be viewed at:\n");
@@ -230,16 +230,25 @@
   }
   // Else use a generic output for arrays.
   else {
-    $message .= $indent . $node->webformcomponents[$key]['name'] .":\n";
-    foreach ($value as $k => $v) {
-      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 ."  ");
-    }
+		if ($key == '') {
+			foreach ($value as $cid => $value) {
+				if ($themed = theme('webform_mail_fields', $cid, $value, $node, $indent)) {
+					$message .= "\n";
+					$message .= $themed;
+				}
+			}
+		} else {
+	    $message .= $indent . $node->webformcomponents[$key]['name'] .":\n";
+	    foreach ($value as $k => $v) {
+	      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);
 }