diff --git a/ChangeLog b/ChangeLog
index 448b6ac19..8d40a38e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-01-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder
+	-subscribe:reallyDoinTheNamesOf:delegatedUsersfromMailInvitation:isMailInvitationinContext:localContext]):
+	explicitly set the content-type of the response to text/plain with
+	charset='utf-8' to work-around a bug in Firefox, complaining about
+	a hypothetical text/xml content he does not receive.
+	* UI/Common/WODirectAction+SOGo.m ([WODirectAction
+	-responseWith204]):
+	same as above.
+
 2009-01-19  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Main/SOGo.m
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 88840eb2d..4339f240e 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -671,6 +671,9 @@ static NSArray *childRecordFields = nil;
   SOGoUser *currentUser;
 
   response = [localContext response];
+  [response setHeader: @"text/plain; charset=utf-8"
+	    forKey: @"Content-Type"];
+
   currentUser = [localContext activeUser];
 
   if (delegatedUsers && [delegatedUsers count])
diff --git a/UI/Common/WODirectAction+SOGo.m b/UI/Common/WODirectAction+SOGo.m
index fd812e53c..91b406db3 100644
--- a/UI/Common/WODirectAction+SOGo.m
+++ b/UI/Common/WODirectAction+SOGo.m
@@ -63,7 +63,13 @@
 
 - (WOResponse *) responseWith204
 {
-  return [self responseWithStatus: 204];
+  WOResponse *response;
+
+  response = [self responseWithStatus: 204];
+  [response setHeader: @"text/plain; charset=utf-8"
+	    forKey: @"Content-Type"];
+
+  return response;
 }
 
 - (WOResponse *) redirectToLocation: (NSString *) newLocation