diff --git a/UI/Contacts/UIxContactFolderActions.m b/UI/Contacts/UIxContactFolderActions.m
index 4dfc2a99d..e3b469e4d 100644
--- a/UI/Contacts/UIxContactFolderActions.m
+++ b/UI/Contacts/UIxContactFolderActions.m
@@ -56,7 +56,7 @@
   id <WOActionResults> response;
   NSArray *contactsId;
   NSEnumerator *uids;
-  NSString *uid;
+  NSString *uid, *filename;
   id currentChild;
   SOGoContactGCSFolder *sourceFolder;
   NSMutableString *content;
@@ -79,10 +79,13 @@
             [content appendFormat: [[currentChild vList] ldifString]];
         }
     }
+
+  filename = [NSString stringWithFormat: @"attachment;filename=%@.ldif", 
+              [self labelForKey: @"Contacts"]];
   response = [context response];
   [response setHeader: @"text/directory; charset=utf-8" 
                forKey: @"content-type"];
-  [response setHeader: @"attachment;filename=SavedContacts.ldif" 
+  [response setHeader: filename 
                forKey: @"Content-Disposition"];
   [response setContent: [content dataUsingEncoding: NSUTF8StringEncoding]];
   
diff --git a/UI/Scheduler/UIxCalFolderActions.m b/UI/Scheduler/UIxCalFolderActions.m
index 04c70e874..5cba79b13 100644
--- a/UI/Scheduler/UIxCalFolderActions.m
+++ b/UI/Scheduler/UIxCalFolderActions.m
@@ -46,6 +46,7 @@
   SOGoAppointmentObject *appt;
   NSArray *array, *values, *fields;
   NSMutableString *rc;
+  NSString *filename;
   iCalCalendar *calendar, *component;
   int i, count;
 
@@ -82,11 +83,12 @@
       if (values && [values count])
         [calendar addChildren: values];
     }
-  NSLog ([calendar versitString]);
   
+  filename = [NSString stringWithFormat: @"attachment;filename=%@.ics",
+              [self labelForKey: @"Calendar"]];
   [response setHeader: @"text/calendar; charset=utf-8" 
                forKey:@"content-type"];
-  [response setHeader: @"attachment;filename=Calendar.ics" 
+  [response setHeader: filename 
                forKey: @"Content-Disposition"];
   [response setContent: [[calendar versitString] dataUsingEncoding: NSUTF8StringEncoding]];