--- 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']) ? '*' : ''; if (!empty($element['#title']) && empty($element['#form_element_skip_title'])) { - $title = $element['#title']; - if (!empty($element['#id'])) { - $output .= ' \n"; + $title = $t('!title !required', array('!title' => filter_xss_admin($element['#title']), '!required' => $required)) + if ($element['#type'] === 'date') { + $output .= '
'; + } + + $output .= "\n"; if (!empty($element['#description'])) { $output .= '