diff --git a/ChangeLog b/ChangeLog
index c5715bb4f..3381a6eb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,26 @@
 	* Added strings to translate and cleaned up the template to send
 	HTML mails instead of text/plain.
 
+2012-07-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(-davNotifyOnPersonalModifications)
+	(-setDavNotifyOnPersonalModifications:)
+	(-davNotifyOnExternalModifications)
+	(-setDavNotifyOnExternalModifications:)
+	(-davNotifyUserOnPersonalModifications)
+	(-setDavNotifyUserOnPersonalModifications:)
+	(-davNotifiedUserOnPersonalModifications)
+	(-setDavNotifiedUserOnPersonalModifications:): new dav accessors.
+
+
+	* SoObjects/SOGo/SOGoObject.m (-davBooleanForResult:): new method
+	that returns a valid DAV boolean from a BOOL.
+	(-isValidDAVBoolean:): new method that validates the value as a
+	DAV boolean.
+	(-resultForDAVBoolean:): new method that returns a BOOL from a DAV
+	boolean.
+
 >>>>>>> variant B
 2012-07-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 66f4982a0..00420ef65 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -537,6 +537,10 @@ vtodo_class2 = "(Confidential task)";
 "Show alarms" = "Show alarms";
 "Show tasks" = "Show tasks";
 
+"Receive a mail when I modify my calendar" = "Receive a mail when I modify my calendar";
+"Receive a mail when someone else modifies my calendar" = "Receive a mail when someone else modifies my calendar";
+"When I modify my calendar, send a mail to:" = "When I modify my calendar, send a mail to:";
+
 "Links to this Calendar" = "Links to this Calendar";
 "Authenticated User Access" = "Authenticated User Access";
 "CalDAV URL" = "CalDAV URL";
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index ec86d3afa..67b04f350 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -304,12 +304,12 @@
                   <input const:name="serverName" const:id="serverName" type="text" const:value=""/></label>
                 <label><var:string label:value="Port:"/>
                   <input const:name="port" const:id="port" type="text" const:value=""/></label><br/>
-                <var:string label:value="Encryption:"/>
-                <label><input const:name="encryption" type="radio" const:value="none"/>
-                  <var:string label:value="None"/></label>
-                <label><input const:name="encryption" type="radio" const:value="ssl"/>
-                  <var:string label:value="SSL"/></label>
-                <label><input const:name="encryption" type="radio" const:value="tls"/>
+                <label><var:string label:value="Encryption:"/>
+                  <input const:name="encryption" type="radio" const:value="none"/>
+                  <var:string label:value="None"/>
+                  <input const:name="encryption" type="radio" const:value="ssl"/>
+                  <var:string label:value="SSL"/>
+                  <input const:name="encryption" type="radio" const:value="tls"/>
                   <var:string label:value="TLS"/></label><br/>
                 <label><var:string label:value="User Name:"/>
                   <input const:name="userName" const:id="userName" type="text" const:value=""/></label><br/>
@@ -331,8 +331,8 @@
                   <input const:name="email" const:id="email" type="text" const:value=""/></label><br/>
                 <label><var:string label:value="Reply To Email:"/>
                   <input const:name="replyTo" const:id="replyTo" type="text" const:value=""/></label><br/>
-                <var:string label:value="Signature:"/>
-                <span id="actSignature"><!--space --></span>
+                <label><var:string label:value="Signature:"/>
+                  <span id="actSignature"><!--space --></span></label>
               </fieldset>
 
               <fieldset const:id="returnReceiptsInfo">