--- contact_field.module	2010-10-04 20:11:25.000000000 -0600
+++ contact_field.module	2010-10-04 20:11:30.000000000 -0600
@@ -312,13 +312,15 @@ function contact_field_mail_alter($messa
       foreach ($am__fields as $type => $field) {
         $as__title = array_values($field);
         $as__field = array_keys($field);
-        if (is_array($message['params'][$as__field[0]])) {
-          $ss__value = _get_field_setting($as__field[0], $message['params'][$as__field[0]]);
-          $ss__additional .= $as__title[0].": \t". $ss__value ."\n";
-        }
-        else {
-          $ss__additional .= $as__title[0] .": \t". $message['params'][$as__field[0]] ."\n"; 
-        }
+		for ($i=0 ; $i < count($field) ; $i++) {
+			if (is_array($message['params'][$as__field[$i]])) {
+				$ss__value = _get_field_setting($as__field[$i], $message['params'][$as__field[$i]]);
+				$ss__additional .= $as__title[$i].": \t". $ss__value ."\n";
+			}
+			else {
+				$ss__additional .= $as__title[$i] .": \t". $message['params'][$as__field[$i]] ."\n"; 
+			}
+		}
       }
       $message['body'][] = "\n". $ss__additional;
     }