diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 96ef231f6bb582429e6a991c85ee85b7920b02fb..e8219516769a0e467d9cf865b40e0345d351842c 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -381,7 +381,6 @@ function comment_admin_settings() {
     '#type' => 'fieldset',
     '#title' => t('Viewing options'),
     '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
   );
 
   $form['viewing_options']['comment_default_mode'] = array(
@@ -424,7 +423,6 @@ function comment_admin_settings() {
     '#type' => 'fieldset',
     '#title' => t('Posting settings'),
     '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
   );
 
   $form['posting_settings']['comment_anonymous'] = array(
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index a14eff7c674ca0b3b8f07b527c0a7048e875ddf7..ec75d9199f58e27eac1c3d34ba2872f095b209f2 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -1031,11 +1031,38 @@ function filter_filter($op, $delta = 0, $format = -1, $text = '') {
  * Settings for the HTML filter.
  */
 function _filter_html_settings($format) {
-  $form['filter_html'] = array('#type' => 'fieldset', '#title' => t('HTML filter'), '#collapsible' => TRUE, '#collapsed' => TRUE);
-  $form['filter_html']["filter_html_$format"] = array('#type' => 'radios', '#title' => t('Filter HTML tags'), '#default_value' => variable_get("filter_html_$format", FILTER_HTML_STRIP), '#options' => array(FILTER_HTML_STRIP => t('Strip disallowed tags'), FILTER_HTML_ESCAPE => t('Escape all tags')), '#description' => t('How to deal with HTML tags in user-contributed content. If set to "Strip disallowed tags", dangerous tags are removed (see below). If set to "Escape tags", all HTML is escaped and presented as it was typed.'));
-  $form['filter_html']["allowed_html_$format"] = array('#type' => 'textfield', '#title' => t('Allowed HTML tags'), '#default_value' => variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'), '#size' => 64, '#maxlength' => 255, '#description' => t('If "Strip disallowed tags" is selected, optionally specify tags which should not be stripped. JavaScript event attributes are always stripped.'));
-  $form['filter_html']["filter_html_help_$format"] = array('#type' => 'checkbox', '#title' => t('Display HTML help'), '#default_value' => variable_get("filter_html_help_$format", 1), '#description' => t('If enabled, Drupal will display some basic HTML help in the long filter tips.'));
-  $form['filter_html']["filter_html_nofollow_$format"] = array('#type' => 'checkbox', '#title' => t('Spam link deterrent'), '#default_value' => variable_get("filter_html_nofollow_$format", FALSE), '#description' => t('If enabled, Drupal will add rel="nofollow" to all links, as a measure to reduce the effectiveness of spam links. Note: this will also prevent valid links from being followed by search engines, therefore it is likely most effective when enabled for anonymous users.'));
+  $form['filter_html'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('HTML filter'),
+    '#collapsible' => TRUE,
+  );
+  $form['filter_html']["filter_html_$format"] = array(
+    '#type' => 'radios',
+    '#title' => t('Filter HTML tags'),
+    '#default_value' => variable_get("filter_html_$format", FILTER_HTML_STRIP),
+    '#options' => array(FILTER_HTML_STRIP => t('Strip disallowed tags'), FILTER_HTML_ESCAPE => t('Escape all tags')),
+    '#description' => t('How to deal with HTML tags in user-contributed content. If set to "Strip disallowed tags", dangerous tags are removed (see below). If set to "Escape tags", all HTML is escaped and presented as it was typed.'),
+  );
+  $form['filter_html']["allowed_html_$format"] = array(
+    '#type' => 'textfield',
+    '#title' => t('Allowed HTML tags'),
+    '#default_value' => variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'),
+    '#size' => 64,
+    '#maxlength' => 255,
+    '#description' => t('If "Strip disallowed tags" is selected, optionally specify tags which should not be stripped. JavaScript event attributes are always stripped.'),
+  );
+  $form['filter_html']["filter_html_help_$format"] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Display HTML help'),
+    '#default_value' => variable_get("filter_html_help_$format", 1),
+    '#description' => t('If enabled, Drupal will display some basic HTML help in the long filter tips.'),
+  );
+  $form['filter_html']["filter_html_nofollow_$format"] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Spam link deterrent'),
+    '#default_value' => variable_get("filter_html_nofollow_$format", FALSE),
+    '#description' => t('If enabled, Drupal will add rel="nofollow" to all links, as a measure to reduce the effectiveness of spam links. Note: this will also prevent valid links from being followed by search engines, therefore it is likely most effective when enabled for anonymous users.'),
+  );
   return $form;
 }
 
@@ -1068,7 +1095,6 @@ function _filter_url_settings($format) {
     '#type' => 'fieldset',
     '#title' => t('URL filter'),
     '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
   );
   $form['filter_urlfilter']['filter_url_length_'. $format] = array(
     '#type' => 'textfield',