Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.124.2.58
diff -u -r1.124.2.58 webform.module
--- webform.module	6 Oct 2008 04:00:29 -0000	1.124.2.58
+++ webform.module	6 Oct 2008 04:36:05 -0000
@@ -355,7 +355,7 @@
     'webform_mail_message' => array(
       'arguments' => array('form_values' => NULL, 'node' => NULL, 'sid' => NULL, 'cid' => NULL),
       'template' => 'webform-mail',
-      'pattern' => 'webform_mail_[0-9]+',
+      'pattern' => 'webform_mail(_[0-9]+)?',
     ),
     'webform_mail_fields' => array(
       'arguments' => array('cid' => NULL, 'value' => NULL, 'node' => NULL, 'indent' => NULL),
@@ -1726,7 +1726,7 @@
     $froms = array();
     $subjects = array();
     foreach ($emails as $cid => $email) {
-      $messages[$cid] = theme(array('webform_mail_'. $node->nid, 'webform_mail_message'), $form_state['values'], $node, $sid, $cid);
+      $messages[$cid] = theme(array('webform_mail_'. $node->nid, 'webform_mail'), $form_state['values'], $node, $sid, $cid);
       $headers[$cid] = theme(array('webform_mail_headers_'. $node->nid, 'webform_mail_headers'), $form_state['values'], $node, $sid, $cid);
 
       // Assemble the FROM string.