diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index 2e4275540..64aa487e7 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -3,8 +3,7 @@
 "Close" = "Close";
 
 /* tabs */
-"Out of Office" = "Out of Office";
-"Date and Time" = "Date and Time";
+"General" = "General";
 "Calendar Options" = "Calendar Options";
 "Mail Options" = "Mail Options";
 "Password" = "Password";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index 3cf0d7128..a3e625db7 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -3,8 +3,7 @@
 "Close" = "Fermer";
 
 /* tabs */
-"Out of Office" = "Absence du bureau";
-"Date and Time" = "Date et heure";
+"General" = "Général";
 "Calendar Options" = "Calendrier";
 "Mail Options" = "Courrier";
 "Password" = "Mot de passe";
diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings
index 1b0ff7ead..34ac16981 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -3,8 +3,7 @@
 "Close" = "Schließen";
 
 /* tabs */
-"Out of Office" = "Abwesenheit";
-"Date and Time" = "Datum und Zeit";
+"General" = "Allgemein";
 "Calendar Options" = "Kalender";
 "Mail Options" = "E-Mail";
 "Password" = "Passwort";
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index c941cf91f..8a890c582 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -13,10 +13,8 @@
   <form id="mainForm" var:href="ownPath">
     <div class="tabsContainer" id="preferencesTabs">
       <ul>
-	<li target="outOfOfficeView"><var:string
-	    label:value="Out of Office"/></li>
-	<li target="dateTimeView"><var:string
-	    label:value="Date and Time"/></li>
+	<li target="generalView"><var:string
+	    label:value="General"/></li>
 	<li target="calendarOptionsView"><var:string
 	    label:value="Calendar Options"/></li>
 	<li target="mailOptionsView"><var:string
@@ -25,23 +23,7 @@
 	  <li target="passwordView"><var:string label:value="Password"/></li>
 	</var:if>
       </ul>
-      <div id="outOfOfficeView" class="tab">
-	<label><input
-	    const:name="inTheOffice" type="radio" const:value="YES"
-	    var:selection="inTheOffice"/>
-	  <var:string label:value="I'm currently in the office"/></label><br/>
-	<label><input
-	    const:name="inTheOffice" type="radio" const:value="NO"
-	    var:selection="inTheOffice"/>
-	  <var:string label:value="I'm currently out of the office"/></label><br/>
-	<br/>
-	<div id="outOfOfficeMessage">
-	  <label><var:string label:value="AutoReply only once to each sender with the following text :"/><br/>
-	    <textarea const:name="autoReplyText" var:value="autoReplyText"/>
-	  </label>
-	</div>
-      </div>
-      <div id="dateTimeView" class="tab">
+      <div id="generalView" class="tab">
 	<label><var:string label:value="Current Time Zone :"/>
 	    <var:popup list="timeZonesList" item="item"
 	      string="item" selection="userTimeZone" /></label><br/>
@@ -95,6 +77,20 @@
 	<label><var:string label:value="Forward messages:"/>
 	  <var:popup list="messageForwardingList" item="item"
 	    string="itemMessageForwardingText" selection="userMessageForwarding"/></label><br/>
+	<label><input
+	    const:name="inTheOffice" type="radio" const:value="YES"
+	    var:selection="inTheOffice"/>
+	  <var:string label:value="I'm currently in the office"/></label><br/>
+	<label><input
+	    const:name="inTheOffice" type="radio" const:value="NO"
+	    var:selection="inTheOffice"/>
+	  <var:string label:value="I'm currently out of the office"/></label><br/>
+	<br/>
+	<div id="outOfOfficeMessage">
+	  <label><var:string label:value="AutoReply only once to each sender with the following text :"/><br/>
+	    <textarea const:name="autoReplyText" var:value="autoReplyText"/>
+	  </label>
+	</div>
       </div>
       <var:if condition="shouldDisplayPasswordChange">
 	<div id="passwordView" class="tab">
diff --git a/UI/WebServerResources/UIxPreferences.css b/UI/WebServerResources/UIxPreferences.css
index 6fdb8616f..5c03ab96c 100644
--- a/UI/WebServerResources/UIxPreferences.css
+++ b/UI/WebServerResources/UIxPreferences.css
@@ -5,30 +5,20 @@ DIV#preferencesTabs
   right: .5em;
   bottom: .5em; }
 
-DIV#dateTimeFormat,
-DIV#passwordView
-{ text-align: right; }
-
-DIV#outOfOfficeView
+DIV#general
 { padding-top: 2em;
   padding-left: 2em;
   padding-right: 5em; }
 
-DIV#outOfOfficeView LABEL
+DIV#general LABEL
 { text-align: left;
   margin-left: 0px;
   white-space: normal; }
 
-DIV#outOfOfficeView TEXTAREA
-{ width: 30em;
-  margin: 0px;
+DIV#mailOptionsView TEXTAREA
+{ width: 420px;
   height: 4em; }
 
-DIV#dateTimeView
-{ padding-top: 3em;
-  padding-left: 1em;
-  padding-right: 2em; }
-
 DIV#passwordView
 { padding-top: 3em;
   padding-right: 10em; }