--- C:/Documents and Settings/amy/Desktop/drupal for staffspace/webform/webform.module	Fri Dec 19 13:19:37 2008
+++ C:/Documents and Settings/amy/Desktop/drupal for staffspace/webform/webform.module.new	Fri Dec 19 11:26:40 2008
@@ -1709,7 +1709,7 @@
     // Set values for the name, address, and subject for the email.
     $email_from_name = $node->webform['email_from_name'];
     $email_from_address = $node->webform['email_from_address'];
-    $email_subject = $node->webform['email_subject'];
+    $email_subject = _webform_filter_values($node->webform['email_subject'], $node, $form_state['values']['submitted']);
     foreach (array('from_name', 'from_address', 'subject') as $field) {
       if ($node->webform['email_'. $field] == 'default') {
         ${'email_'. $field} = _webform_filter_values(webform_variable_get('webform_default_'. $field), $node, $form_state['values']['submitted']);
@@ -2027,7 +2027,13 @@
       $find[] = '%cid['. $cid .']';
       $replace[] = $value;
     }
+
+    foreach ($_POST['submitted'] as $key => $variable) {
+      $find[] = '%webform['. $key .']';
+      $replace[] = $variable;
+    }
   }
+
 
   // Load the user profile.
   if ($user->uid && module_exists('profile')) {