Index: mollom.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/mollom/mollom.module,v
retrieving revision 1.2.2.137
diff -u -r1.2.2.137 mollom.module
--- mollom.module	24 Mar 2010 16:27:51 -0000	1.2.2.137
+++ mollom.module	21 May 2010 00:45:51 -0000
@@ -203,6 +203,8 @@
   );
   $items['admin/settings/mollom/manage/%mollom_form'] = array(
     'title' => 'Configure',
+    'title callback' => 'mollom_admin_configure_form_title',
+    'title arguments' => array(4),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('mollom_admin_configure_form', 4),
     'access arguments' => array('administer mollom'),
@@ -265,6 +267,13 @@
 }
 
 /**
+ * Title callback for mollom form configrations.
+ */
+function mollom_admin_configure_form_title($mollom_form) {
+  return t('Configure Mollom') . ': ' . $mollom_form['title'];
+}
+
+/**
  * Access callback; check if the module is configured.
  *
  * This function does not actually check whether Mollom keys are valid for the
Index: mollom.admin.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/mollom/mollom.admin.inc,v
retrieving revision 1.1.2.26
diff -u -r1.1.2.26 mollom.admin.inc
--- mollom.admin.inc	12 Mar 2010 03:07:44 -0000	1.1.2.26
+++ mollom.admin.inc	21 May 2010 00:45:51 -0000
@@ -150,15 +150,19 @@
       foreach ($mollom_form['enabled_fields'] as $value) {
         $enabled_fields[] = rawurlencode($value);
       }
-      $form['mollom']['enabled_fields'] = array(
-        '#type' => 'checkboxes',
+      $form['mollom']['analyze'] = array(
+        '#type' => 'fieldset',
         '#title' => t('Fields to analyze'),
+        '#description' => t('If no fields are selected, the form will be protected by a CAPTCHA.'),
+      );
+      $form['mollom']['analyze']['enabled_fields'] = array(
+        '#type' => 'checkboxes',
         '#options' => $elements,
         '#default_value' => $enabled_fields,
-        '#description' => t('If no fields are selected, the form will be protected by a CAPTCHA.'),
+        '#parents' => array('mollom', 'enabled_fields'),
       );
-      if (empty($form['mollom']['enabled_fields']['#options'])) {
-        $form['mollom']['enabled_fields']['#description'] = t('No fields are available.');
+      if (empty($form['mollom']['analyze']['enabled_fields']['#options'])) {
+        $form['mollom']['analyze']['#description'] = t('No fields are available.');
       }
       $form['actions']['submit'] = array(
         '#type' => 'submit',