4 files changed, 11 insertions, 3 deletions
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 6d2464144..ba4926f15 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -197,6 +197,8 @@ $labels['htmlsignature'] = 'HTML signature';
 $labels['previewpane'] = 'Show preview pane';
 $labels['logoutclear'] = 'Clear Trash on logout';
 $labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
 $labels['autosavedraft'] = 'Automatically save draft';
 $labels['everynminutes'] = 'every $n minutes';
 $labels['never'] = 'never';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index ddd1a5f1f..c4a85b8ff 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -252,6 +252,8 @@ $labels['htmlsignature'] = 'HTML signature';
 $labels['previewpane'] = 'Show preview pane';
 $labels['logoutclear'] = 'Clear Trash on logout';
 $labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
 
 $labels['autosavedraft']  = 'Automatically save draft';
 $labels['everynminutes']  = 'every $n minutes';
diff --git a/program/localization/pl/labels.inc b/program/localization/pl/labels.inc
index ec2e76a33..b79c2f87e 100644
--- a/program/localization/pl/labels.inc
+++ b/program/localization/pl/labels.inc
@@ -201,6 +201,8 @@ $labels['htmlsignature'] = 'Podpis w HTML';
 $labels['previewpane'] = 'Pokaż podgląd';
 $labels['logoutclear'] = 'Przy wylogowaniu opróżnij Kosz';
 $labels['logoutcompact'] = 'Przy wylogowaniu porządkuj folder Odebrane';
+$labels['uisettings'] = 'Interfejs użytkownika';
+$labels['serversettings'] = 'Ustawienia serwera';
 $labels['autosavedraft'] = 'Automatyczny zapis tworzonej wiadomości';
 $labels['everynminutes'] = 'co $n minut';
 $labels['never'] = 'nigdy';
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 81da0a29d..502ca147e 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -40,8 +40,8 @@ function rcmail_user_prefs_form($attrib)
   // allow the following attributes to be added to the <table> tag
   $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
 
-  // return the complete edit form as table
-  $out = "$form_start<table" . $attrib_str . ">\n\n";
+  // return the complete edit form as tables
+  $out = "$form_start<fieldset><legend>" . Q(rcube_label('uisettings')) . "</legend>\n<table" . $attrib_str . ">\n\n";
 
   // show language selection
   if (!isset($no_override['language']))
@@ -180,6 +180,8 @@ function rcmail_user_prefs_form($attrib)
                     Q(rcube_label('previewpane')),
                     $input_preview->show($CONFIG['preview_pane']?1:0));
     }
+
+  $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('serversettings')) . "</legend>\n<table" . $attrib_str . ">\n\n";
                   
   if (!empty($CONFIG['drafts_mbox']) && !isset($no_override['draft_autosave']))
     {
@@ -217,7 +219,7 @@ function rcmail_user_prefs_form($attrib)
                     $input_expunge->show($CONFIG['logout_expunge']?1:0));
     }
 
-  $out .= "\n</table>$form_end";
+  $out .= "\n</table></fieldset>$form_end";
 
   return $out;  
   }