diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings
index 0067b60cd..c6256673b 100644
--- a/UI/Contacts/English.lproj/Localizable.strings
+++ b/UI/Contacts/English.lproj/Localizable.strings
@@ -86,9 +86,6 @@
 "Recipient" = "Recipient";
 "Carbon Copy" = "Carbon Copy";
 "Blind Carbon Copy" = "Blind Carbon Copy";
-"Add Attendee..." = "Add Attendee...";
-"Add Assistant" = "Add Assistant";
-"Add Delegate" = "Add Delegate";
 
 "New Addressbook..." = "New Addressbook...";
 "Subscribe to an Addressbook..." = "Subscribe to an Addressbook...";
@@ -97,3 +94,8 @@
 "Name of the Address Book" = "Name of the Address Book";
 "Are you sure you want to delete the selected address book?"
 = "Are you sure you want to delete the selected address book?";
+
+"You cannot subscribe to a folder that you own!"
+= "You cannot subscribe to a folder that you own!";
+"Unable to subscribe to that folder!"
+= "Unable to subscribe to that folder!";
diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings
index 45053a701..660de0242 100644
--- a/UI/Contacts/French.lproj/Localizable.strings
+++ b/UI/Contacts/French.lproj/Localizable.strings
@@ -98,11 +98,6 @@
 "Recipient" = "Destinataire";
 "Carbon Copy" = "Copie carbone";
 "Blind Carbon Copy" = "C. carbone cachée";
-"Add Attendee..." = "Ajouter participant...";
-"Add Calendar..." = "Ajouter agenda...";
-"Add Address Book..." = "Ajouter carnet...";
-"Add Assistant" = "Ajouter comme assistant";
-"Add Delegate" = "Ajouter comme délégué";
 
 "New Addressbook..." = "Nouveau carnet d'adresses...";
 "Subscribe to an Addressbook..." = "S'inscrire à un carnet d'adresses...";
@@ -111,3 +106,8 @@
 "Name of the Address Book" = "Nom du carnet d'adresses";
 "Are you sure you want to delete the selected address book?"
 = "Voulez-vous vraiment supprimer le carnet d'adresses sélectionné ?";
+
+"You cannot subscribe to a folder that you own!"
+= "Vous ne pouvez pas vous inscrire à un dossier qui vous appartient!";
+"Unable to subscribe to that folder!"
+= "Impossible de vous inscrire à ce dossier!";
diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile
index 2c8b9a36f..ed831d329 100644
--- a/UI/Contacts/GNUmakefile
+++ b/UI/Contacts/GNUmakefile
@@ -9,9 +9,7 @@ ContactsUI_PRINCIPAL_CLASS = ContactsUIProduct
 ContactsUI_LANGUAGES = English French
 
 ContactsUI_OBJC_FILES =			\
-	UIxContactsAclsSelection.m \
-	UIxContactsAddressBooksSelection.m \
-	UIxContactsCalendarsSelection.m	\
+	UIxContactsUserFolders.m \
 	UIxContactsMailerSelection.m	\
 	\
 	ContactsUIProduct.m		\
@@ -20,7 +18,6 @@ ContactsUI_OBJC_FILES =			\
 	UIxContactEditor.m		\
 	UIxContactsListView.m		\
 	UIxContactsListViewContainer.m	\
-	UIxContactSelector.m	\
 	UIxContactFoldersView.m		\
 
 ContactsUI_RESOURCE_FILES +=		\
diff --git a/UI/Contacts/product.plist b/UI/Contacts/product.plist
index 6e4d7ea82..663ab8d97 100644
--- a/UI/Contacts/product.plist
+++ b/UI/Contacts/product.plist
@@ -1,5 +1,5 @@
 { /* -*-javascript-*- */
-  requires = ( MAIN, CommonUI, Contacts );
+  requires = ( MAIN, MainUI, CommonUI, Contacts );
 
   publicResources = ();
 
@@ -22,36 +22,21 @@
               pageName    = "UIxContactFoldersView";
               actionName  = "newAb";
            };
-           scheduler-contacts = {
-              protectedBy = "View";
-              pageName    = "UIxContactFoldersView";
-              actionName  = "selectForScheduler";
-           };
            mailer-contacts = {
               protectedBy = "View";
               pageName    = "UIxContactFoldersView";
               actionName  = "selectForMailer";
            };
-           calendars-contacts = {
-              protectedBy = "View";
-              pageName    = "UIxContactFoldersView";
-              actionName  = "selectForCalendars";
-           };
-           addressbooks-contacts = {
-              protectedBy = "View";
-              pageName    = "UIxContactFoldersView";
-              actionName  = "selectForAddressBooks";
-           };
-           acls-contacts = {
-              protectedBy = "View";
-              pageName    = "UIxContactFoldersView";
-              actionName  = "selectForAcls";
-           };
            contactSearch = {
               protectedBy = "View";
               pageName    = "UIxContactFoldersView";
               actionName  = "contactSearch";
            };
+           foldersSearch = {
+              protectedBy = "View";
+              pageName    = "UIxContactFoldersView";
+              actionName  = "foldersSearch";
+           };
            updateAdditionalAddressBooks = {
               protectedBy = "View";
               pageName    = "UIxContactFoldersView";
@@ -64,13 +49,17 @@
            saveAcls = {
               protectedBy = "SaveAcls";
               pageName    = "UIxAclEditor";
-              actionName = "saveAcls";
+              actionName  = "saveAcls";
            };
            checkRights = {
               protectedBy = "View";
               pageName    = "UIxContactFoldersView"; 
               actionName  = "checkRights";
            };
+	   userFolders = {
+              protectedBy = "View";
+              pageName    = "UIxContactsUserFolders"; 
+	   };
         };
      };
 
@@ -94,27 +83,12 @@
            mailer-contacts = {
               protectedBy = "View";
               pageName    = "UIxContactsListView";
-              actionName = "mailerContacts";
-           };
-           calendars-contacts = {
-              protectedBy = "View";
-              pageName    = "UIxContactsListView";
-              actionName = "calendarsContacts";
-           };
-           acls-contacts = {
-              protectedBy = "View";
-              pageName    = "UIxContactsListView";
-              actionName  = "aclsContacts";
-           };
-           addressbooks-contacts = {
-              protectedBy = "View";
-              pageName    = "UIxContactsListView";
-              actionName = "addressBooksContacts";
+              actionName  = "mailerContacts";
            };
 	   delete = {
               protectedBy = "View";
               pageName    = "UIxContactsListView";
-              actionName = "delete";
+              actionName  = "delete";
 	   };
         };
      };
@@ -136,31 +110,16 @@
               pageName    = "UIxContactEditor";
               actionName  = "new";
            };
-           scheduler-contacts = {
-              protectedBy = "View";
-              pageName    = "UIxContactsListView";
-              actionName = "schedulerContacts";
-           };
            mailer-contacts = {
               protectedBy = "View";
               pageName    = "UIxContactsListView";
               actionName = "mailerContacts";
            };
-           calendars-contacts = {
-              protectedBy = "View";
+	   canAccessContent = {
+	      protectedBy = "View";
               pageName    = "UIxContactsListView";
-              actionName = "calendarsContacts";
-           };
-           acls-contacts = {
-              protectedBy = "View";
-              pageName    = "UIxContactsListView";
-              actionName  = "aclsContacts";
-           };
-           addressbooks-contacts = {
-              protectedBy = "View";
-              pageName    = "UIxContactsListView";
-              actionName = "addressBooksContacts";
-           };
+	      actionName = "canAccessContent";
+	   };
         };
      };
 
diff --git a/UI/MainUI/product.plist b/UI/MainUI/product.plist
index 2ee0e399f..6895273fe 100644
--- a/UI/MainUI/product.plist
+++ b/UI/MainUI/product.plist
@@ -17,7 +17,7 @@
     };
     SOGoUserFolder = {
       superclass  = "SOGoFolder";
-      protectedBy = "HomePage Access";
+      /* protectedBy = "HomePage Access"; */
       defaultRoles = {
         "Homepage Access" = ( "Owner", "Assistant", "Delegate", "FreeBusy" );
         "WebDAV Access" = ( "Owner", "Assistant", "Delegate", "FreeBusy" );
diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index b90b510e0..d3594c4b5 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -20,7 +20,6 @@ SchedulerUI_OBJC_FILES =		\
 					\
 	UIxComponent+Agenor.m		\
 	UIxCalView.m			\
-	UIxCalCalendarsListView.m	\
 	UIxCalAptListView.m		\
 	UIxCalTasksListView.m		\
 	UIxCalDayView.m			\
@@ -32,6 +31,7 @@ SchedulerUI_OBJC_FILES =		\
 					\
 	UIxAttendeesEditor.m		\
 	UIxComponentEditor.m		\
+	UIxCalendarSelector.m		\
 	UIxAppointmentView.m		\
 	UIxAppointmentEditor.m		\
 	UIxAppointmentProposal.m	\
@@ -40,12 +40,10 @@ SchedulerUI_OBJC_FILES =		\
 	UIxTaskProposal.m	\
 	UIxCalSelectTab.m		\
 	UIxCalDateLabel.m		\
-	UIxCalBackForthNavView.m	\
 	UIxDatePicker.m			\
 	UIxTimeDateControl.m		\
 	UIxCalInlineAptView.m		\
 	UIxCalInlineMonthAptView.m	\
-	UIxCalScheduleOverview.m	\
 	UIxCalParticipationStatusView.m	\
 	UIxCalMonthOverview.m