From bb5cf04e7e502fce0a7b4e35a9a8d29c5bd2020a Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 9 Dec 2011 14:54:00 +0000
Subject: [PATCH] Monotone-Parent: 8d583d2e8977d0d63e028818f6f961246d256bdd
 Monotone-Revision: 8c58bbcc380816930dac5d8da2d1d682049a6349

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-09T14:54:00
---
 UI/Templates/PreferencesUI/UIxPreferences.wox | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 2b3cce7e4..06d0771c1 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -20,13 +20,15 @@
       <ul>
         <li target="generalView"><span>
             <var:string label:value="General" /></span></li>
-	<var:if condition="userHasCalendarAccess">
+	<var:if condition="isCalendarEnabled">
           <li target="calendarOptionsView"><span><var:string
                 label:value="Calendar Options"/></span></li>
 	</var:if
-          ><li target="contactsOptionsView"><span><var:string
-              label:value="Contacts Options"/></span></li
-          ><var:if condition="userHasMailAccess">
+          ><var:if condition="isContactsEnabled">
+          <li target="contactsOptionsView"><span><var:string
+                label:value="Contacts Options"/></span></li>
+        </var:if
+          ><var:if condition="isMailEnabled">
           <li target="mailOptionsView"><span><var:string
                 label:value="Mail Options"/></span></li>
           <li target="mailAccountsView"><span><var:string
@@ -80,7 +82,7 @@
                 /></label>
           </div>
         </div>
-        <var:if condition="userHasCalendarAccess">
+        <var:if condition="isCalendarEnabled">
           <div id="calendarOptionsView" class="tab">
             <label><var:string label:value="Week begins on :"/>
               <var:popup list="daysList" item="item"
@@ -179,7 +181,7 @@
           <input type="hidden" const:id="contactsCategoriesValue" 
             const:name="contactsCategoriesValue" var:value="contactsCategoriesValue"/>
         </div>
-        <var:if condition="userHasMailAccess">
+        <var:if condition="isMailEnabled">
           <div id="mailOptionsView" class="tab">
             <label><input type="checkbox" 
                 const:name="subscribedFoldersOnly"