Index: captcha.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/captcha/captcha.module,v
retrieving revision 1.49
diff -u -r1.49 captcha.module
--- captcha.module	2 Dec 2007 19:11:47 -0000	1.49
+++ captcha.module	3 Dec 2007 16:10:30 -0000
@@ -519,25 +519,24 @@
       return;
     }
     $captcha_point = db_fetch_object($result);
+    $form['captcha'] = array(
+      '#type' => 'fieldset',
+      '#title' => 'CAPTCHA',
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+    );
     if ($captcha_point && $captcha_point->type) {
-      $form['captcha'] = array(
-        '#type' => 'item',
-        '#title' => t('CAPTCHA administration'),
-        '#description' => t('The challenge "@type" (by module "@module") is enabled here for untrusted users: !edit, !disable or !general.', array(
-          '@type' => $captcha_point->type,
-          '@module' => $captcha_point->module,
-          '!edit' => l(t('edit challenge type'), "admin/user/captcha/$form_id", array('query' => drupal_get_destination())),
-          '!disable' => l(t('disable challenge'), "admin/user/captcha/$form_id/disable", array('query' => drupal_get_destination())),
-          '!general' => l(t('edit general challenge settings'), 'admin/user/captcha'),
-        ))
+      $form['captcha']['#description'] = t('The challenge "@type" (by module "@module") is enabled here for untrusted users: !edit, !disable or !general.', array(
+           '@type' => $captcha_point->type,
+           '@module' => $captcha_point->module,
+           '!edit' => l(t('edit challenge type'), "admin/user/captcha/$form_id", array(), drupal_get_destination()),
+           '!disable' => l(t('disable challenge'), "admin/user/captcha/$form_id/disable", array(), drupal_get_destination()),
+           '!general' => l(t('edit general challenge settings'), "admin/user/captcha"),
+        )
       );
     }
     else {
-      $form['captcha'] = array(
-        '#type' => 'item',
-        '#title' => t('CAPTCHA administration'),
-        '#description' => l(t('Place a challenge here for untrusted users.'), "admin/user/captcha/$form_id/enable", array('query' => drupal_get_destination())),
-      );
+      $form['captcha']['#description'] = l(t('Place a challenge here for untrusted users.'), "admin/user/captcha/$form_id/enable", array(), drupal_get_destination());
     }
     // Add pre_render function for placing the CAPTCHA just above the submit button
     $form['captcha']['#pre_render'] = array('captcha_pre_render_place_captcha');