--- includes/form.inc	2009-08-17 03:12:15.000000000 -0400
+++ includes/form.inc	2009-08-17 13:17:22.000000000 -0400
@@ -2526,16 +2526,25 @@
   $required = !empty($element['#required']) ? '<span class="form-required" title="' . $t('This field is required.') . '">*</span>' : '';
 
   if (!empty($element['#title']) && empty($element['#form_element_skip_title'])) {
-    $title = $element['#title'];
-    if (!empty($element['#id'])) {
-      $output .= ' <label for="' . $element['#id'] . '">' . $t('!title !required', array('!title' => filter_xss_admin($title), '!required' => $required)) . "</label>\n";
+    $title = $t('!title !required', array('!title' => filter_xss_admin($element['#title']), '!required' => $required));
+    if ($element['#type'] === 'date') {
+      $output .= ' <fieldset class="date"><legend>'. $title ."</legend>\n";
+	}
+    elseif (!empty($element['#id'])) {
+      $output .= ' <label for="' . $element['#id'] . '">' . $title . "</label>\n";
     }
     else {
-      $output .= ' <label>' . $t('!title !required', array('!title' => filter_xss_admin($title), '!required' => $required)) . "</label>\n";
+      $output .= ' <label>' . $title . "</label>\n";
     }
   }
 
-  $output .= " " . $element['#children'] . "\n";
+  $output .= " " . $element['#children'];
+
+  if ($element['#type'] === 'date') {
+    $output .= '</fieldset>';
+  }
+
+  $output .= "\n";
 
   if (!empty($element['#description'])) {
     $output .= ' <div class="description">' . $element['#description'] . "</div>\n";