<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
<link rel="stylesheet" type="text/css" href="/settings.css" />
+<script type="text/javascript" src="/functions.js"></script>
</head>
-<body>
+<body onload="rcube_init_settings_tabs()">
<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
<roundcube:include file="/includes/settingstabs.html" />
+<form name="form" action="./" method="post">
+
<div id="userprefs-box">
<div id="userprefs-title"><roundcube:label name="userpreferences" /></div>
-<div style="padding:15px">
-<roundcube:object name="userprefs">
-
-<p><roundcube:button command="save" type="input" class="button" label="save" /></p>
+<div style="padding:15px 0 15px 15px">
+<div class="userprefs-block">
+ <roundcube:object name="userprefs" form="form" parts="general,mailbox,mailview" />
+</div>
+<div class="userprefs-block">
+ <roundcube:object name="userprefs" form="form" parts="compose,folders,server" />
+</div>
+<div style="clear:left"></div>
</div>
</div>
-<roundcube:include file="/includes/settingscripts.html" />
+<p id="listbuttons">
+<roundcube:button command="save" type="input" class="button mainaction" label="save" />
+</p>
+
+</form>
+
+<div class="advswitch">
+<label for="advswitch"><roundcube:label name="advancedoptions"></label>
+<input type="checkbox" id="advswitch" name="_advanced" value="0" onclick="rcube_show_advanced(this.checked)" />
+</div>
</body>
</html>