--- drupal-6.13/includes/form.inc	2009-05-26 04:18:46.000000000 -0400
+++ drupal-dev/includes/form.inc	2009-08-14 10:14:14.000000000 -0400
@@ -2200,16 +2200,25 @@
   $required = !empty($element['#required']) ? '<span class="form-required" title="'. $t('This field is required.') .'">*</span>' : '';
 
   if (!empty($element['#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 .= " $value\n";
+  $output .= " $value";
+
+  if ($element['#type'] === 'date') {
+    $output .= '</fieldset>';
+  }
+
+  $output .= "\n";
 
   if (!empty($element['#description'])) {
     $output .= ' <div class="description">'. $element['#description'] ."</div>\n";