diff --git a/includes/form.inc b/includes/form.inc
index 41b0ee2..8308019 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -4044,6 +4044,9 @@ function theme_form_element($variables) {
   if (!empty($element['#attributes']['disabled'])) {
     $attributes['class'][] = 'form-disabled';
   }
+  if (!empty($element['#wrapper_attributes']['class'])) {
+    $attributes['class'] = array_merge($attributes['class'], $element['#wrapper_attributes']['class']);
+  }
   $output = '<div' . drupal_attributes($attributes) . '>' . "\n";
 
   // If #title is not set, we don't display any label or required marker.