diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index bf57f571a..291419557 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -18,38 +18,38 @@
         <li target="generalView"><span>
             <var:string label:value="General" /></span></li>
 	<var:if condition="userHasCalendarAccess">
-    <li target="calendarOptionsView"><span><var:string
-          label:value="Calendar Options"/></span></li>
+          <li target="calendarOptionsView"><span><var:string
+                label:value="Calendar Options"/></span></li>
 	</var:if>
 	<var:if condition="userHasMailAccess">
-    <li target="mailOptionsView"><span><var:string
-          label:value="Mail Options"/></span></li>
-    <li target="identitiesView"><span><var:string
-          label:value="Signature"/></span></li>
-    <var:if condition="isVacationEnabled"><li target="vacationView"><span><var:string
-            label:value="Vacation"/></span></li></var:if>
-    <var:if condition="isForwardEnabled"><li target="forwardView"><span><var:string
-            label:value="Forward"/></span></li></var:if>
+          <li target="mailOptionsView"><span><var:string
+                label:value="Mail Options"/></span></li>
+          <li target="identitiesView"><span><var:string
+                label:value="Signature"/></span></li>
+          <var:if condition="isVacationEnabled"><li target="vacationView"><span><var:string
+                  label:value="Vacation"/></span></li></var:if>
+          <var:if condition="isForwardEnabled"><li target="forwardView"><span><var:string
+                  label:value="Forward"/></span></li></var:if>
 	</var:if>
 	<var:if condition="shouldDisplayAdditionalPreferences">
-    <li target="additionalView"><span>
-        <var:string label:value="Additional Parameters"/></span></li>
+          <li target="additionalView"><span>
+              <var:string label:value="Additional Parameters"/></span></li>
  	</var:if>
-<!--	<var:if condition="shouldDisplayPasswordChange"> -->
-<!-- 	  <li target="passwordView"><var:string label:value="Password"/></li> -->
-<!-- 	</var:if> -->
+        <!--	<var:if condition="shouldDisplayPasswordChange"> -->
+        <!-- 	  <li target="passwordView"><var:string label:value="Password"/></li> -->
+        <!-- 	</var:if> -->
       </ul>
       <div id="generalView" class="tab">
 	<label><var:string label:value="Language :"/>
-	<var:popup list="languages" item="item"
-		   const:id="language"
-		   string="languageText" 
-		   selection="language"
-		   label:noSelectionString="choose" /></label><br/>
+          <var:popup list="languages" item="item"
+            const:id="language"
+            string="languageText" 
+            selection="language"
+            label:noSelectionString="choose" /></label><br/>
 	<label><var:string label:value="Current Time Zone :"/>
-	<var:popup list="timeZonesList" item="item"
-		   const:id="timezone"
-		   string="item" selection="userTimeZone" /></label><br/>
+          <var:popup list="timeZonesList" item="item"
+            const:id="timezone"
+            string="item" selection="userTimeZone" /></label><br/>
 	<br/>
 	<div id="dateTimeFormat">
 	  <label><var:string label:value="Short Date Format :"/>
@@ -66,12 +66,12 @@
 	    <var:popup list="timeFormatsList" item="item"
 	      const:id="timeFormat"
 	      string="itemTimeFormatText" selection="userTimeFormat"
-        /></label><br/>
-    <label><var:string label:value="Default module :"/>
-      <var:popup list="availableModules" item="item"
-        const:id="defaultModule"
-        string="itemModuleText" selection="userDefaultModule"
-        /></label>
+              /></label><br/>
+          <label><var:string label:value="Default module :"/>
+            <var:popup list="availableModules" item="item"
+              const:id="defaultModule"
+              string="itemModuleText" selection="userDefaultModule"
+              /></label>
 	</div>
       </div>
       <var:if condition="userHasCalendarAccess">
@@ -96,59 +96,59 @@
 	      const:id="firstWeek"
 	      string="itemFirstWeekText" selection="userFirstWeek"
 	      /></label><br/>
-    <label><var:string label:value="Categories"/></label>
-    <div id="categoriesListWrapper"
-      ><table id="categoriesList" cellspacing="0">
-      <thead>
-        <tr class="tableview"
-          ><td const:class="tbtv_headercell" const:id="nameTableHeader"
-            ><var:string var:value="nameLabel" /></td
-          ><td const:class="tbtv_headercell" const:width="20%" const:id="colorTableHeader"
-            ><var:string var:value="colorLabel" /></td
-          ></tr
-        ></thead>
-      <tbody>
-        <var:foreach list="categoryList" item="category">
-          <tr const:class="categoryListRow"
-            ><td const:class="categoryListCell"
-              ><var:string var:value="category"/></td
-            ><td const:class="categoryListCell"
-              ><div const:class="colorBox"><var:string var:value="categoryColor"
-                  /></div></td
-            ></tr>
-        </var:foreach>
-      </tbody>
-    </table></div>
-    <div class="bottomToolbar">
-      <a const:id="categoryAdd" class="bottomButton" href="#">
-        <span><img rsrc:src="add-icon.png" label:title="Add" />
-      </span></a>
-      <a const:id="categoryDelete" class="bottomButton" href="#">
-        <span><img rsrc:src="remove-icon.png" label:title="Delete" />
-      </span></a>
-    </div>
-    <input type="hidden" const:id="categoriesValue" 
-      const:name="categoriesValue" var:value="categoriesValue"/>
-<!-- 	  <br/> -->
-<!-- 	  <label><input class="checkBox" -->
-<!-- 	      type="checkbox" var:selection="reminderEnabled" -->
-<!-- 	      var:checked="reminderEnabled"/><var:string -->
-<!-- 	      label:value="Enable reminders for Calendar items"/></label><br/> -->
-<!-- 	  <label><input class="checkBox" -->
-<!-- 	      type="checkbox" var:selection="remindWithASound" -->
-<!-- 	      var:checked="remindWithASound"/><var:string -->
-<!-- 	      label:value="Play a sound when a reminder comes due"/></label><br/> -->
-<!-- 	  <label><var:string label:value="Default reminder :"/> -->
-<!-- 	    <var:popup list="reminderTimesList" item="item" -->
-<!-- 	      string="itemReminderTimeText" selection="userReminderTime"/></label> -->
+          <label><var:string label:value="Categories"/></label>
+          <div id="categoriesListWrapper"
+            ><table id="categoriesList" cellspacing="0">
+              <thead>
+                <tr class="tableview"
+                  ><td const:class="tbtv_headercell" const:id="nameTableHeader"
+                    ><var:string var:value="nameLabel" /></td
+                    ><td const:class="tbtv_headercell" const:id="colorTableHeader"
+                    ><var:string var:value="colorLabel" /></td
+                    ></tr
+                  ></thead>
+              <tbody>
+                <var:foreach list="categoryList" item="category">
+                  <tr const:class="categoryListRow"
+                    ><td const:class="categoryListCell"
+                      ><var:string var:value="category"/></td
+                      ><td const:class="categoryListCell"
+                      ><div const:class="colorBox"><var:string var:value="categoryColor"
+                          /></div></td
+                      ></tr>
+                </var:foreach>
+              </tbody>
+            </table></div>
+          <div class="bottomToolbar">
+            <a const:id="categoryAdd" class="bottomButton" href="#">
+              <span><img rsrc:src="add-icon.png" label:title="Add" />
+              </span></a>
+            <a const:id="categoryDelete" class="bottomButton" href="#">
+              <span><img rsrc:src="remove-icon.png" label:title="Delete" />
+              </span></a>
+          </div>
+          <input type="hidden" const:id="categoriesValue" 
+            const:name="categoriesValue" var:value="categoriesValue"/>
+          <!-- 	  <br/> -->
+          <!-- 	  <label><input class="checkBox" -->
+          <!-- 	      type="checkbox" var:selection="reminderEnabled" -->
+          <!-- 	      var:checked="reminderEnabled"/><var:string -->
+          <!-- 	      label:value="Enable reminders for Calendar items"/></label><br/> -->
+          <!-- 	  <label><input class="checkBox" -->
+          <!-- 	      type="checkbox" var:selection="remindWithASound" -->
+          <!-- 	      var:checked="remindWithASound"/><var:string -->
+          <!-- 	      label:value="Play a sound when a reminder comes due"/></label><br/> -->
+          <!-- 	  <label><var:string label:value="Default reminder :"/> -->
+          <!-- 	    <var:popup list="reminderTimesList" item="item" -->
+          <!-- 	      string="itemReminderTimeText" selection="userReminderTime"/></label> -->
 	</div>
       </var:if>
       <var:if condition="userHasMailAccess">
 	<div id="mailOptionsView" class="tab">
 	  <label><input type="checkbox" 
-	            const:name="subscribedFoldersOnly"
-		    const:id="subscribedFoldersOnly"
-		    var:checked="showSubscribedFoldersOnly" />
+              const:name="subscribedFoldersOnly"
+              const:id="subscribedFoldersOnly"
+              var:checked="showSubscribedFoldersOnly" />
 	    <var:string label:value="Show subscribed mailboxes only"/></label><br/>
 	  <label><var:string label:value="Check for new mail:"/>
 	    <var:popup list="messageCheckList" item="item"
@@ -160,19 +160,19 @@
 	      string="itemMessageForwardingText"
 	      selection="userMessageForwarding"/></label><br/>
 	  <var:popup list="replyPlacementList" item="item"
-      const:id="replyPlacementList"
-	  	string="itemReplyPlacementText"
-      selection="userReplyPlacement"/>
-    <br /><label><var:string label:value="And place my signature"/></label>
+            const:id="replyPlacementList"
+            string="itemReplyPlacementText"
+            selection="userReplyPlacement"/>
+          <br /><label><var:string label:value="And place my signature"/></label>
 	  <var:popup list="signaturePlacementList" item="item"
-      const:id="signaturePlacementList"
-	  	string="itemSignaturePlacementText"
-      selection="userSignaturePlacement"/>
-    <br /><label><var:string label:value="Compose messages in"/></label>
+            const:id="signaturePlacementList"
+            string="itemSignaturePlacementText"
+            selection="userSignaturePlacement"/>
+          <br /><label><var:string label:value="Compose messages in"/></label>
 	  <var:popup list="composeMessagesType" item="item"
-      const:id="composeMessagesType"
-	  	string="itemComposeMessagesText"
-      selection="userComposeMessagesType"/>
+            const:id="composeMessagesType"
+            string="itemComposeMessagesText"
+            selection="userComposeMessagesType"/>
 	</div>
 	<div id="identitiesView" class="tab">
 	  <!--<var:multiselection const:id="identitiesList" item="item"
@@ -183,90 +183,90 @@
 	    var:value="signature" />
 	</div>
 	<var:if condition="isVacationEnabled">
-    <div id="vacationView" class="tab">
+          <div id="vacationView" class="tab">
 	    <label><input type="checkbox" 
-	                  const:name="enableVacation"
-                    const:id="enableVacation"
-                    var:checked="enableVacation" />
-	    <var:string label:value="Enable vacation auto reply"/></label>
-	  <div id="vacation">
-	    <label><var:string label:value="Auto reply message :"/><br/>
-	    <textarea const:name="autoReplyText"
-		      const:id="autoReplyText"
-		      var:value="autoReplyText"/>
-	    </label><br/>
-	    
-	    <label><var:string label:value="Email addresses (separated by commas) :"/><br/>
-	    <input type="hidden"
-        const:id="defaultEmailAddresses"
-        var:value="defaultEmailAddresses" />
-	    <textarea const:name="autoReplyEmailAddresses"
-        const:id="autoReplyEmailAddresses"
-        var:value="autoReplyEmailAddresses" /><br/>
-      <span><a href="#" class="button" id="addDefaultEmailAddresses"><span>
-            <var:string label:value="Add default email addresses" /></span></a>
-      </span>
-	    </label><br/>
+                const:name="enableVacation"
+                const:id="enableVacation"
+                var:checked="enableVacation" />
+              <var:string label:value="Enable vacation auto reply"/></label>
+            <div id="vacation">
+              <label><var:string label:value="Auto reply message :"/><br/>
+                <textarea const:name="autoReplyText"
+                  const:id="autoReplyText"
+                  var:value="autoReplyText"/>
+              </label><br/>
+              
+              <label><var:string label:value="Email addresses (separated by commas) :"/><br/>
+                <input type="hidden"
+                  const:id="defaultEmailAddresses"
+                  var:value="defaultEmailAddresses" />
+                <textarea const:name="autoReplyEmailAddresses"
+                  const:id="autoReplyEmailAddresses"
+                  var:value="autoReplyEmailAddresses" /><br/>
+                <span><a href="#" class="button" id="addDefaultEmailAddresses"><span>
+                      <var:string label:value="Add default email addresses" /></span></a>
+                </span>
+              </label><br/>
 
-	    <label><var:string label:value="Days between responses :"/> 
-	    <var:popup list="daysBetweenResponsesList" item="item"
-		       const:id="daysBetweenResponsesList"
-		       string="item" 
-		       selection="daysBetweenResponses" /></label><br/>
+              <label><var:string label:value="Days between responses :"/> 
+                <var:popup list="daysBetweenResponsesList" item="item"
+                  const:id="daysBetweenResponsesList"
+                  string="item" 
+                  selection="daysBetweenResponses" /></label><br/>
 
-	    <label><input type="checkbox" 
-	                  const:name="ignoreLists"
-			  const:id="ignoreLists"
-			  var:checked="ignoreLists" />
-	    <var:string label:value="Do not send responses to mailing lists" /></label><br/>
+              <label><input type="checkbox" 
+                  const:name="ignoreLists"
+                  const:id="ignoreLists"
+                  var:checked="ignoreLists" />
+                <var:string label:value="Do not send responses to mailing lists" /></label><br/>
 
-	  </div>
-	</div>
+            </div>
+          </div>
 	</var:if>
 	<var:if condition="isForwardEnabled">
-	<div id="forwardView" class="tab">
+          <div id="forwardView" class="tab">
 	    <label><input type="checkbox" 
-	                  const:name="enableForward"
-			  const:id="enableForward"
-			  var:checked="enableForward" />
-	    <var:string label:value="Forward incoming messages"/></label><br/>
+                const:name="enableForward"
+                const:id="enableForward"
+                var:checked="enableForward" />
+              <var:string label:value="Forward incoming messages"/></label><br/>
 	    
-	  <div id="forward">
-	    <label><var:string label:value="Forward to address :"/> 
-	    <input type="text" 
-		   const:id="forwardAddress" 
-		   const:name="forwardAddress"
-		   var:value="forwardAddress"
-		   size="30" /></label><br/>
+            <div id="forward">
+              <label><var:string label:value="Forward to address :"/> 
+                <input type="text" 
+                  const:id="forwardAddress" 
+                  const:name="forwardAddress"
+                  var:value="forwardAddress"
+                  size="30" /></label><br/>
 
-	    <label><input type="checkbox" 
-	                  const:name="forwardKeepCopy"
-			  const:id="forwardKeepCopy"
-			  var:checked="forwardKeepCopy" />
-	    <var:string label:value="Keep a copy" /></label><br/>
+              <label><input type="checkbox" 
+                  const:name="forwardKeepCopy"
+                  const:id="forwardKeepCopy"
+                  var:checked="forwardKeepCopy" />
+                <var:string label:value="Keep a copy" /></label><br/>
 
-	  </div>
-	</div>
+            </div>
+          </div>
 	</var:if>
       </var:if>
       <var:if condition="shouldDisplayAdditionalPreferences"
 	><div id="additionalView" class="tab">
 	  <var:component className="UIxAdditionalPreferences"/>
 	</div></var:if>
-<!--       <var:if condition="shouldDisplayPasswordChange"> -->
-<!-- 	<div id="passwordView" class="tab"> -->
-<!-- 	  <label><var:string label:value="New password:" -->
-<!-- 	      /><input type="text" class="textField" -->
-<!-- 	      const:enabled="disabled" -->
-<!-- 	      var:value="newPassword"/></label><br/> -->
-<!-- 	  <label><var:string label:value="Confirmation:" -->
-<!-- 	      /><input type="text" class="textField" -->
-<!-- 	      const:enabled="disabled" -->
-<!-- 	      var:value="newPasswordConfirmation"/></label><br/> -->
-<!-- 	  <input type="button" class="button" -->
-<!-- 	    id="changePasswordBtn" label:value="Change"/> -->
-<!-- 	</div> -->
-<!--       </var:if> -->
+      <!--       <var:if condition="shouldDisplayPasswordChange"> -->
+      <!-- 	<div id="passwordView" class="tab"> -->
+      <!-- 	  <label><var:string label:value="New password:" -->
+      <!-- 	      /><input type="text" class="textField" -->
+      <!-- 	      const:enabled="disabled" -->
+      <!-- 	      var:value="newPassword"/></label><br/> -->
+      <!-- 	  <label><var:string label:value="Confirmation:" -->
+      <!-- 	      /><input type="text" class="textField" -->
+      <!-- 	      const:enabled="disabled" -->
+      <!-- 	      var:value="newPasswordConfirmation"/></label><br/> -->
+      <!-- 	  <input type="button" class="button" -->
+      <!-- 	    id="changePasswordBtn" label:value="Change"/> -->
+      <!-- 	</div> -->
+      <!--       </var:if> -->
       <input type="hidden" id="hasChanged" name="hasChanged"
 	var:value="hasChanged"/>
     </div>
diff --git a/UI/WebServerResources/UIxPreferences.css b/UI/WebServerResources/UIxPreferences.css
index 2ed8e6564..f5a6bf5d7 100644
--- a/UI/WebServerResources/UIxPreferences.css
+++ b/UI/WebServerResources/UIxPreferences.css
@@ -34,9 +34,6 @@ TEXTAREA#signature
   height: 345px;
   width: 415px;}
 
-TABLE#categoriesList
-{ width: 100%; }
-
 DIV#categoriesListWrapper
 { overflow: auto;
   position: absolute;
@@ -46,8 +43,21 @@ DIV#categoriesListWrapper
   left: 2em;
   padding: 0px;
   margin-top: 2px;
-  border-left: 1px solid #9B9B9B;
-  background: #CCDDEC; }
+  border-left: 1px solid #9b9b9b;
+  background: #ccddec; }
+
+TABLE#categoriesList
+{ width: 100%; }
+
+#colorTableHeader
+{ width: 40px; }
+
+TR.categoryListRow
+{ background: #ccddec;
+  cursor: pointer; }
+
+TD.categoryListCell
+{ -moz-user-select: none; }
 
 DIV.colorBox
 { border: 1px solid #333333;
@@ -57,13 +67,6 @@ DIV.colorBox
   margin: 0 3px 0 0;
   width: 1em; }
 
-TR.categoryListRow
-{ background: #CCDDEC;
-  cursor: pointer; }
-
-TD.categoryListCell
-{ -moz-user-select: none; }
-
 DIV#windowButtons
 { position: fixed;
   bottom: 20px;