Index: /trunk/roundcubemail/CHANGELOG
===================================================================
--- /trunk/roundcubemail/CHANGELOG	(revision 1299)
+++ /trunk/roundcubemail/CHANGELOG	(revision 1300)
@@ -1,4 +1,8 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/04/14 (alec)
+----------
+- Added sections (fieldset+label) in Settings interface
 
 2008/04/12 (alec)
Index: /trunk/roundcubemail/program/localization/en_GB/labels.inc
===================================================================
--- /trunk/roundcubemail/program/localization/en_GB/labels.inc	(revision 1299)
+++ /trunk/roundcubemail/program/localization/en_GB/labels.inc	(revision 1300)
@@ -198,4 +198,6 @@
 $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';
Index: /trunk/roundcubemail/program/localization/en_US/labels.inc
===================================================================
--- /trunk/roundcubemail/program/localization/en_US/labels.inc	(revision 1299)
+++ /trunk/roundcubemail/program/localization/en_US/labels.inc	(revision 1300)
@@ -253,4 +253,6 @@
 $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';
Index: /trunk/roundcubemail/program/localization/pl/labels.inc
===================================================================
--- /trunk/roundcubemail/program/localization/pl/labels.inc	(revision 1299)
+++ /trunk/roundcubemail/program/localization/pl/labels.inc	(revision 1300)
@@ -222,4 +222,6 @@
 $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';
Index: /trunk/roundcubemail/program/steps/settings/func.inc
===================================================================
--- /trunk/roundcubemail/program/steps/settings/func.inc	(revision 1299)
+++ /trunk/roundcubemail/program/steps/settings/func.inc	(revision 1300)
@@ -41,6 +41,6 @@
   $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
@@ -181,4 +181,6 @@
                     $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']))
@@ -218,5 +220,5 @@
     }
 
-  $out .= "\n</table>$form_end";
+  $out .= "\n</table></fieldset>$form_end";
 
   return $out;  
Index: /trunk/roundcubemail/skins/default/settings.css
===================================================================
--- /trunk/roundcubemail/skins/default/settings.css	(revision 1299)
+++ /trunk/roundcubemail/skins/default/settings.css	(revision 1300)
@@ -198,2 +198,14 @@
   width: 90px;
 }
+
+fieldset 
+{
+  margin-bottom: 0.5em;
+  border: 1px solid #999999;
+}
+
+legend
+{
+  color: #999999;
+}
+  
Index: /trunk/roundcubemail/skins/default/templates/settings.html
===================================================================
--- /trunk/roundcubemail/skins/default/templates/settings.html	(revision 1299)
+++ /trunk/roundcubemail/skins/default/templates/settings.html	(revision 1300)
@@ -18,5 +18,5 @@
 <roundcube:object name="userprefs">
 
-<p><br /><roundcube:button command="save" type="input" class="button" label="save" /></p>
+<p><roundcube:button command="save" type="input" class="button" label="save" /></p>
 </div>
 </div>