--- theme.cvs.old.inc	2005-06-07 10:25:35.082406400 -0700
+++ theme.cvs.inc	2005-06-07 10:32:56.417014400 -0700
@@ -597,11 +597,12 @@
   $required = $required ? '<span class="form-required">*</span>' : '';
 
   if ($title) {
+    $delim = ($title{strlen($title) - 1} == '?' ? '' : ':');
     if ($id) {
-      $output .= ' <label for="'. form_clean_id($id) .'">'. $title .':</label>'. $required ."<br />\n";
+      $output .= ' <label for="'. form_clean_id($id) .'">'. $title . $delim .'</label>'. $required ."<br />\n";
     }
     else {
-      $output .= ' <label>'. $title .':</label>'. $required ."<br />\n";
+      $output .= ' <label>'. $title . $delim .'</label>'. $required ."<br />\n";
     }
   }