diff --git a/drupal/sites/all/modules/webform/webform.module b/drupal/sites/all/modules/webform/webform.module
index 7b3f51e..f93056d 100644
--- a/drupal/sites/all/modules/webform/webform.module
+++ b/drupal/sites/all/modules/webform/webform.module
@@ -2808,10 +2808,12 @@ function _webform_filter_values($string, $node = NULL, $submission = NULL, $emai
     // Provide blanks for components in the webform but not in the submission.
     $missing_components = array_diff_key($node->webform['components'], $submission->data);
     foreach ($missing_components as $component) {
-      $parents = webform_component_parent_keys($node, $component);
-      $form_key = implode('][', $parents);
-      $replacements['email'][$format]['%email[' . $form_key . ']'] = '';
-      $replacements['email'][$format]['%value[' . $form_key . ']'] = '';
+      if ($component['type'] != "fieldset") {
+        $parents = webform_component_parent_keys($node, $component);
+        $form_key = implode('][', $parents);
+        $replacements['email'][$format]['%email[' . $form_key . ']'] = '';
+        $replacements['email'][$format]['%value[' . $form_key . ']'] = '';
+      }
     }
 
     // Submission edit URL.