diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index fdb38e602..f19e2177b 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -264,9 +264,12 @@ function rcmail_folder_form($attrib)
             $content = rcmail_get_form_part($tab, $attrib);
         }
 
-        if ($content) {
+        if ($content && sizeof($form) > 1) {
             $out .= html::tag('fieldset', null, html::tag('legend', null, Q($tab['name'])) . $content) ."\n";
         }
+        else {
+            $out .= $content ."\n";
+        }
     }
 
     $out .= "\n$form_end";