diff --git a/ChangeLog b/ChangeLog
index 9a59d9c76..c24bd1cc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
 	contain an ':' in them
 	* SoObjects/Appointments/iCalPerson+SOGo.m
 	Fixed the check for quoted SENT-BY
+	* Updated the iCal invitation replies to take
+	the SENT-BY into account.
 
 2008-11-11  Ludovic Marcotte  <lmarcotte@inverse.ca>
 	
diff --git a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html
index 6eb7b0bf5..8cb7ba49e 100644
--- a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html
+++ b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html
@@ -1,2 +1,2 @@
 <#IsSubject>Antwoord voor de gebeurtenisuitnodiging: <#summary/></#IsSubject>
-<#IsBody><#organizer/> heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd</#HasAccepted><#HasDeclined>geweigerd</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined>.</#IsBody>
+<#IsBody><#organizer/><#HasSentBy>(sent by <#sentBy/>) </#HasSentBy> heeft uw uitnodiging voor de gebeurtenis <#HasAccepted>geaccepteerd</#HasAccepted><#HasDeclined>geweigerd</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined>.</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod
index 2ade0637f..aebf86c26 100644
--- a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod
+++ b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod
@@ -28,3 +28,12 @@ HasDeclined: WOConditional {
 HasNotAcceptedNotDeclined: WOConditional {
   condition = hasNotAcceptedNotDeclined;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html
index f1c04f883..4d9397882 100644
--- a/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html
+++ b/SoObjects/Appointments/SOGoAptMailEnglishICalReply.wo/SOGoAptMailEnglishICalReply.html
@@ -1,2 +1,2 @@
 <#IsSubject>Event Invitation Reply: <#summary/></#IsSubject>
-<#IsBody><#attendee/> has <#HasSentBy>(sent by <#sentBy/>) </#HasSentBy><#HasAccepted>accepted</#HasAccepted><#HasDeclined>declined</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> your event invitation.</#IsBody>
+<#IsBody><#attendee/> has <#HasSentBy>(sent by <#sentBy/>)  </#HasSentBy><#HasAccepted>accepted</#HasAccepted><#HasDeclined>declined</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> your event invitation.</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html
index e6f65ab18..e83939934 100644
--- a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html
+++ b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.html
@@ -1,2 +1,2 @@
 <#IsSubject>Réponse à l'invitation : «<#summary/>»</#IsSubject>
-<#IsBody><#attendee/> a <#HasAccepted>accepté</#HasAccepted><#HasDeclined>refusé</#HasDeclined><#HasNotAcceptedNotDeclined>choisi de reporter sa décision par rapport à</#HasNotAcceptedNotDeclined> votre invitation.</#IsBody>
\ No newline at end of file
+<#IsBody><#attendee/> <#HasSentBy>(envoyé par <#sentBy/>) </#HasSentBy> a <#HasAccepted>accepté</#HasAccepted><#HasDeclined>refusé</#HasDeclined><#HasNotAcceptedNotDeclined>choisi de reporter sa décision par rapport à</#HasNotAcceptedNotDeclined> votre invitation.</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod
index 2ade0637f..aebf86c26 100644
--- a/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod
+++ b/SoObjects/Appointments/SOGoAptMailFrenchICalReply.wo/SOGoAptMailFrenchICalReply.wod
@@ -28,3 +28,12 @@ HasDeclined: WOConditional {
 HasNotAcceptedNotDeclined: WOConditional {
   condition = hasNotAcceptedNotDeclined;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html
index 2baf03b65..d242cbf4d 100644
--- a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html
+++ b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html
@@ -1,2 +1,2 @@
 <#IsSubject>Antwort Termineinladung: <#summary/></#IsSubject>
-<#IsBody><#attendee/> hat Ihre Termineinladung <#HasAccepted>akzeptiert</#HasAccepted><#HasDeclined>abgelehnt</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined></#IsBody>.
\ No newline at end of file
+<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) </#HasSentBy> hat Ihre Termineinladung <#HasAccepted>akzeptiert</#HasAccepted><#HasDeclined>abgelehnt</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined></#IsBody>.
diff --git a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod
index 2ade0637f..aebf86c26 100644
--- a/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod
+++ b/SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.wod
@@ -28,3 +28,12 @@ HasDeclined: WOConditional {
 HasNotAcceptedNotDeclined: WOConditional {
   condition = hasNotAcceptedNotDeclined;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html
index 19f05c571..68a9774e6 100644
--- a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html
+++ b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.html
@@ -1,2 +1,2 @@
 <#IsSubject>Re: Appuntemento : "<#summary/>"</#IsSubject>
-<#IsBody><#attendee/> ha <#HasAccepted>accettato</#HasAccepted><#HasDeclined>declinato</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> l'invito al proprio evento.</#IsBody>
+<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) </#HasSentBy> ha <#HasAccepted>accettato</#HasAccepted><#HasDeclined>declinato</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> l'invito al proprio evento.</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod
index 2ade0637f..aebf86c26 100644
--- a/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod
+++ b/SoObjects/Appointments/SOGoAptMailItalianICalReply.wo/SOGoAptMailItalianICalReply.wod
@@ -28,3 +28,12 @@ HasDeclined: WOConditional {
 HasNotAcceptedNotDeclined: WOConditional {
   condition = hasNotAcceptedNotDeclined;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html
index 0fbb62387..6f82c321c 100644
--- a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html
+++ b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html
@@ -1,2 +1,2 @@
 <#IsSubject>Respuesta a la invitación al evento: <#summary/></#IsSubject>
-<#IsBody><#attendee/> ha <#HasAccepted>aceptado</#HasAccepted><#HasDelined>rechazado</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> su invitación al evento.</#IsBody>
\ No newline at end of file
+<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) </#HasSentBy> ha <#HasAccepted>aceptado</#HasAccepted><#HasDelined>rechazado</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined> su invitación al evento.</#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod
index 2ade0637f..aebf86c26 100644
--- a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod
+++ b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod
@@ -28,3 +28,12 @@ HasDeclined: WOConditional {
 HasNotAcceptedNotDeclined: WOConditional {
   condition = hasNotAcceptedNotDeclined;
 }
+
+HasSentBy: WOConditional {
+  condition = hasSentBy;
+}
+
+sentBy: WOString {
+  value = sentBy;
+  escapeHTML = NO;
+}
\ No newline at end of file
diff --git a/SoObjects/SOGo/SOGoCache.m b/SoObjects/SOGo/SOGoCache.m
index e10da72e5..5b5473d89 100644
--- a/SoObjects/SOGo/SOGoCache.m
+++ b/SoObjects/SOGo/SOGoCache.m
@@ -83,8 +83,8 @@ static SOGoCache *sharedCache = nil;
       
       s_userDefaults = [[NSMutableDictionary alloc] init];
       s_userSettings = [[NSMutableDictionary alloc] init];
-
-        // We register ourself for notifications
+      
+      // We register ourself for notifications
       [[NSDistributedNotificationCenter defaultCenter]
 	addObserver: self
 	selector: @selector(_userDefaultsHaveChanged:)