diff --git sites/all/modules/webform/includes/webform.components.inc sites/all/modules/webform/includes/webform.components.inc
index 09c8081..4a0756f 100644
--- sites/all/modules/webform/includes/webform.components.inc
+++ sites/all/modules/webform/includes/webform.components.inc
@@ -377,6 +377,13 @@ function webform_component_edit_form(&$form_state, $node, $component, $clone = F
     '#description' => t('A short description of the field used as help for the user when he/she uses the form.') . theme('webform_token_help'),
     '#weight' => -1,
   );
+    $form['extra']['css_classes'] = array(
+    '#type' => 'textfield',
+    '#default_value' => isset($component['display']['css_classes']) ? $component['extra']['css_classes'] : '',
+    '#title' => t('CSS Class(es)'),
+    '#description' => t('Apply the above CSS class(es) to the field.  Separate by space.'),
+    '#weight' => -1,
+  );
 
   // Display settings.
   $form['display'] = array(
diff --git sites/all/modules/webform/webform.module sites/all/modules/webform/webform.module
index 596489c..34ee5b7 100644
--- sites/all/modules/webform/webform.module
+++ sites/all/modules/webform/webform.module
@@ -1781,6 +1781,9 @@ function _webform_client_form_add_component($node, $component, $component_value,
     if ($element = webform_component_invoke($component['type'], 'render', $component, $data, $filter)) {
       $parent_fieldset[$component['form_key']] = $element;
 
+      // Add any classes specified
+        $parent_fieldset[$component['form_key']]['#attributes']['class'] .= $component['extra']['css_classes'];
+        
       // Override the value if one already exists in the form state.
       if (isset($component_value)) {
         $parent_fieldset[$component['form_key']]['#default_value'] = $component_value;