diff --git a/ChangeLog b/ChangeLog
index 5403129b0..3b247b292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-22  Cyril Robert <crobert@inverse.ca>
+
+	* UI/Scheduler/UIxCalFolderActions.m (exportAction): Used bareFetchFields from
+	SOGoAppointmentFolder instead of fetchFields from SOGoGCSFolder.
+
 2009-09-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MailerUI/UIxMailListView.m (+initialize): new method
diff --git a/UI/Contacts/UIxContactFolderActions.m b/UI/Contacts/UIxContactFolderActions.m
index e3b469e4d..9f53dd195 100644
--- a/UI/Contacts/UIxContactFolderActions.m
+++ b/UI/Contacts/UIxContactFolderActions.m
@@ -80,8 +80,8 @@
         }
     }
 
-  filename = [NSString stringWithFormat: @"attachment;filename=%@.ldif", 
-              [self labelForKey: @"Contacts"]];
+  filename = [NSString stringWithFormat: @"attachment;filename=\"%@.ldif\"", 
+              [folder displayName]];
   response = [context response];
   [response setHeader: @"text/directory; charset=utf-8" 
                forKey: @"content-type"];
diff --git a/UI/Scheduler/UIxCalFolderActions.m b/UI/Scheduler/UIxCalFolderActions.m
index 5cba79b13..7b75d9e77 100644
--- a/UI/Scheduler/UIxCalFolderActions.m
+++ b/UI/Scheduler/UIxCalFolderActions.m
@@ -58,7 +58,12 @@
   folder = [self clientObject];
   calendar = [iCalCalendar groupWithTag: @"vcalendar"];
 
-  array = [[folder ocsFolder] fetchFields: fields matchingQualifier: nil];
+  array = [folder bareFetchFields: fields
+                             from: nil
+                               to: nil
+                            title: nil
+                        component: nil
+                additionalFilters: nil];
   count = [array count];
   for (i = 0; i < count; i++)
     {
@@ -84,8 +89,8 @@
         [calendar addChildren: values];
     }
   
-  filename = [NSString stringWithFormat: @"attachment;filename=%@.ics",
-              [self labelForKey: @"Calendar"]];
+  filename = [NSString stringWithFormat: @"attachment;filename=\"%@.ics\"",
+              [folder displayName]];
   [response setHeader: @"text/calendar; charset=utf-8" 
                forKey:@"content-type"];
   [response setHeader: filename