diff --git a/ChangeLog b/ChangeLog
index 1cc14f34e..782fb12a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Scheduler/UIxCalendarProperties.m ([UIxCalendarProperties -calendarSyncTag])
+	([UIxCalendarProperties -setCalendarSyncTag:newTag]): new
+	accessors to retrieve and set the calendar tags from the template.
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m ([SOGoAppointmentFolder -syncTag])
+	([SOGoAppointmentFolder -setSyncTag:newSyncTag]): new accessors
+	that retrieves and set the calendar tags.
+
 2008-06-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MainUI/SOGoUserHomePage.m ([SOGoUserHomePage
diff --git a/UI/Scheduler/Dutch.lproj/Localizable.strings b/UI/Scheduler/Dutch.lproj/Localizable.strings
index 29348e5ab..014e68f7a 100644
--- a/UI/Scheduler/Dutch.lproj/Localizable.strings
+++ b/UI/Scheduler/Dutch.lproj/Localizable.strings
@@ -455,3 +455,8 @@ vtodo_class2 = "(Vertrouwelijke taak)";
 "Multicolumn Day View" = "Meerdere kolommen dagweergave";
 
 "Please select an event or a task." = "Selecteer een afspraak of een taak.";
+
+/* Properties dialog */
+"Name:" = "Naam:";
+"Color:" = "Kleur:";
+"Tag:" = "Tag:";
diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index ab7281bec..74c07732a 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -472,3 +472,8 @@ vtodo_class2 = "(Confidential task)";
 "Multicolumn Day View" = "Multicolumn Day View";
 
 "Please select an event or a task." = "Please select an event or a task.";
+
+/* Properties dialog */
+"Name:" = "Name:";
+"Color:" = "Color:";
+"Tag:" = "Tag:";
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index 05ef723b8..d429e86a0 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -468,4 +468,9 @@ vtodo_class2 = "(Tâche confidentielle)";
 "closeThisWindowMessage" = "Merci! Vous pouvez maintenant fermer cette fenêtre ou consulter votre ";
 "Multicolumn Day View" = "Multicolonne";
 
-"Please select an event or a task." = "Veuillez sélectionner un événement ou une tâche.";
\ No newline at end of file
+"Please select an event or a task." = "Veuillez sélectionner un événement ou une tâche.";
+
+/* Properties dialog */
+"Name:" = "Nom :";
+"Color:" = "Couleur :";
+"Tag:" = "Label :";
diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings
index 0c2ff42e5..b03f4a6da 100644
--- a/UI/Scheduler/German.lproj/Localizable.strings
+++ b/UI/Scheduler/German.lproj/Localizable.strings
@@ -456,3 +456,8 @@ vtodo_class2 = "(Confidential task)";
 "Multicolumn Day View" = "Multicolonne";
 
 "Please select an event or a task." = "Bitte wählen Sie einen Termin oder eine Aufgabe aus!";
+
+/* Properties dialog */
+"Name:" = "Name:";
+"Color:" = "Farbe:";
+"Tag:" = "Tag:";
diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings
index ae064e47a..83b6707c7 100644
--- a/UI/Scheduler/Italian.lproj/Localizable.strings
+++ b/UI/Scheduler/Italian.lproj/Localizable.strings
@@ -470,3 +470,8 @@ vtodo_class2 = "(Attività confidenziale)";
 "Suggest time slot:" = "Periodo suggerito:";
 "From" = "Da";
 "To" = "A";
+
+/* Properties dialog */
+"Name:" = "Nome:";
+"Color:" = "Colore:";
+"Tag:" = "Tag:";
diff --git a/UI/Scheduler/Spanish.lproj/Localizable.strings b/UI/Scheduler/Spanish.lproj/Localizable.strings
index f2a316d2c..a6b3960d9 100644
--- a/UI/Scheduler/Spanish.lproj/Localizable.strings
+++ b/UI/Scheduler/Spanish.lproj/Localizable.strings
@@ -476,3 +476,8 @@ vtodo_class2 = "(Tarea confidencial)";
 "Multicolumn Day View" = "Vista diaria multicolumna";
 "Please select an event or a task." 
 	= "Seleccione un evento o tarea, por favor";
+
+/* Properties dialog */
+"Name:" = "Nombre:";
+"Color:" = "Color:";
+"Tag:" = "Redacción:";
diff --git a/UI/Scheduler/UIxCalendarProperties.m b/UI/Scheduler/UIxCalendarProperties.m
index 0dbb77cad..249a7ebcc 100644
--- a/UI/Scheduler/UIxCalendarProperties.m
+++ b/UI/Scheduler/UIxCalendarProperties.m
@@ -77,6 +77,16 @@
   [calendar setCalendarColor: newColor];
 }
 
+- (NSString *) calendarSyncTag
+{
+  return [calendar syncTag];
+}
+
+- (void) setCalendarSyncTag: (NSString *) newTag
+{
+  [calendar setSyncTag: newTag];
+}
+
 - (BOOL) shouldTakeValuesFromRequest: (WORequest *) request
                            inContext: (WOContext*) context
 {
diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index 5207d7ff8..20ffa1388 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -11,22 +11,31 @@
   const:popup="YES"
   title="title">
   <form const:href="saveProperties" name="propertiesform">
-    <input type="hidden" const:name="calendarID" const:id="calendarID" var:value="calendarID"/>
+    <input type="hidden" const:name="calendarID" const:id="calendarID"
+      var:value="calendarID"/>
     <div id="propertiesView">
-      <label><var:string label:value="Name:" /><span class="content"
-          ><input type="text" name="calendarName" id="calendarName"
-	    var:disabled="calendarNameIsDisabled"
-            class="textField"
-            var:value="calendarName"
-            /></span></label>
-      <label><var:string label:value="Color:" /><span class="content"
-          ><button id="colorButton"><!-- space --></button>
-	  <input type="hidden"
-	    name="calendarColor"
-	    id="calendarColor"
-            class="textField"
-            var:value="calendarColor"
-            /></span></label>
+      <span class="line"><label
+	  ><var:string label:value="Name:"
+	    /><span class="content"
+	    ><input type="text" name="calendarName" id="calendarName"
+	      var:disabled="calendarNameIsDisabled"
+	      class="textField"
+	      var:value="calendarName"
+	      /></span></label></span>
+      <span class="line"><label><var:string
+	    label:value="Color:"/><span class="content"
+	    ><button id="colorButton"><!-- space --></button
+	      ><input type="hidden"
+	      name="calendarColor"
+	      id="calendarColor"
+	      var:value="calendarColor"
+	      /></span></label><label id="calendarSync"><var:string
+	    label:value="Tag:"/><input type="text"
+	    name="calendarSyncTag"
+	    id="calendarSyncTag"
+	    class="textField"
+	    var:value="calendarSyncTag"
+	    /></label></span>
     </div>
     <div id="buttons">
       <input type="button"
diff --git a/UI/WebServerResources/UIxCalendarProperties.css b/UI/WebServerResources/UIxCalendarProperties.css
index 4ab24e1e8..32df47050 100644
--- a/UI/WebServerResources/UIxCalendarProperties.css
+++ b/UI/WebServerResources/UIxCalendarProperties.css
@@ -1,4 +1,4 @@
-LABEL
+SPAN.line
 { display: block;
   position: relative;
   line-height: 18px;
@@ -14,9 +14,12 @@ DIV#propertiesView
 SPAN.content
 { position: absolute;
   top: -.25em;
-  left: 4em;
+  left: 6em;
   right: 1em; }
 
+LABEL#calendarSync
+{ margin-left: 7em; }
+
 BUTTON#colorButton
 { display: none;
   margin: 1px;
@@ -33,3 +36,6 @@ DIV#buttons
 { padding: 10px;
   padding-top: 0px;
   text-align: right; }
+
+INPUT#calendarSyncTag
+{ width: 5em; }