diff --git a/ChangeLog b/ChangeLog
index 84d2063cc..16ec2c914 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-16  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* Updated the ICSimport text to be more specific
+	* We now warn for no SSL bundle in GNUstep when
+	trying to load a remote ICS file and it's failing
+	over SSL. It's a guess but it's better than nothing.
+
 2009-09-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoGCSFolder.m (-lookupName:inContext:acquire:):
diff --git a/SoObjects/Appointments/SOGoWebAppointmentFolder.m b/SoObjects/Appointments/SOGoWebAppointmentFolder.m
index f6a65a2c1..395fb2e47 100644
--- a/SoObjects/Appointments/SOGoWebAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoWebAppointmentFolder.m
@@ -44,6 +44,13 @@
   if (url)
     {
       data = [NSData dataWithContentsOfURL: url];
+
+      if (!data && [[location lowercaseString] hasPrefix: @"https"]) 
+	{
+	  NSLog(@"WARNING: Your GNUstep installation might not have SSL support.");
+	  return -1;
+	}
+
       contents = [[NSString alloc] initWithData: data 
                                        encoding: NSUTF8StringEncoding];
       [contents autorelease];
diff --git a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
index 35a318601..1d37e6a36 100644
--- a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
@@ -106,7 +106,7 @@
 "Sharing..." = "Compartilhamento...";
 "Export Calendar..." = "Exportar Calendário...";
 "Import Events..." = "Import Events...";
-"Select file..." = "Select file...";
+"Select iCalendar file (*.ics)..." = "Select iCalendar file (*.ics)...";
 "Upload" = "Upload";
 "Publish Calendar..." = "Publicar Calendário...";
 "Reload Remote Calendars" = "Recarregar Calendários Remotos";
diff --git a/UI/Scheduler/Dutch.lproj/Localizable.strings b/UI/Scheduler/Dutch.lproj/Localizable.strings
index 2ab0c41e0..6b9e47397 100644
--- a/UI/Scheduler/Dutch.lproj/Localizable.strings
+++ b/UI/Scheduler/Dutch.lproj/Localizable.strings
@@ -106,7 +106,7 @@
 "Sharing..." = "Delen...";
 "Export Calendar..." = "Agenda exporteren...";
 "Import Events..." = "Import Events...";
-"Select file..." = "Select file...";
+"Select iCalendar file (*.ics)..." = "Select iCalendar file (*.ics)...";
 "Upload" = "Upload";
 "Publish Calendar..." = "Agenda publiceren...";
 "Reload Remote Calendars" = "Externe agenda vernieuwen";
diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index bff2e9230..164e09b80 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -106,7 +106,7 @@
 "Sharing..." = "Sharing...";
 "Export Calendar..." = "Export Calendar...";
 "Import Events..." = "Import Events...";
-"Select file..." = "Select file...";
+"Select iCalendar file (*.ics)..." = "Select iCalendar file (*.ics)...";
 "Upload" = "Upload";
 "Publish Calendar..." = "Publish Calendar...";
 "Reload Remote Calendars" = "Reload Remote Calendars";
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index 1f9ad73a6..883f45f03 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -106,7 +106,7 @@
 "Sharing..." = "Partage...";
 "Export Calendar..." = "Exporter l'agenda...";
 "Import Events..." = "Importer des événements...";
-"Select file..." = "Sélectionner un fichier...";
+"Select iCalendar file (*.ics)..." = "Sélectionner un fichier. iCalendar (*.ics)...";
 "Upload" = "Ajouter";
 "Publish Calendar..." = "Publier l'agenda...";
 "Reload Remote Calendars" = "Recharger les agendas distants";
diff --git a/UI/Scheduler/Hungarian.lproj/Localizable.strings b/UI/Scheduler/Hungarian.lproj/Localizable.strings
index 1f1715497..5befa1405 100644
--- a/UI/Scheduler/Hungarian.lproj/Localizable.strings
+++ b/UI/Scheduler/Hungarian.lproj/Localizable.strings
@@ -106,7 +106,7 @@
 "Sharing..." = "Megosztás...";
 "Export Calendar..." = "Naptár exportálása...";
 "Import Events..." = "Import Events...";
-"Select file..." = "Select file...";
+"Select iCalendar file (*.ics)..." = "Select iCalendar file (*.ics)...";
 "Upload" = "Upload";
 "Publish Calendar..." = "Naptár közzététele...";
 "Reload Remote Calendars" = "Távoli naptárak frissítése";
diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings
index 699c32437..6df62ce78 100644
--- a/UI/Scheduler/Italian.lproj/Localizable.strings
+++ b/UI/Scheduler/Italian.lproj/Localizable.strings
@@ -106,7 +106,7 @@
 "Sharing..." = "Condivisione";
 "Export Calendar..." = "Esporta calendario...";
 "Import Events..." = "Import Events...";
-"Select file..." = "Select file...";
+"Select iCalendar file (*.ics)..." = "Select iCalendar file (*.ics)...";
 "Upload" = "Upload";
 "Publish Calendar..." = "Pubblica calendario...";
 "Reload Remote Calendars" = "Aggiorna calendari remoti";
diff --git a/UI/Scheduler/Spanish.lproj/Localizable.strings b/UI/Scheduler/Spanish.lproj/Localizable.strings
index 23991ebc4..72dd3b398 100644
--- a/UI/Scheduler/Spanish.lproj/Localizable.strings
+++ b/UI/Scheduler/Spanish.lproj/Localizable.strings
@@ -106,7 +106,7 @@
 "Sharing..." = "Compartir...";
 "Export Calendar..." = "Exportar calendario...";
 "Import Events..." = "Import Events...";
-"Select file..." = "Select file...";
+"Select iCalendar file (*.ics)..." = "Select iCalendar file (*.ics)...";
 "Upload" = "Upload";
 "Publish Calendar..." = "Publicar calendario...";
 "Reload Remote Calendars" = "Recargar calendarios remotos";
diff --git a/UI/Scheduler/Welsh.lproj/Localizable.strings b/UI/Scheduler/Welsh.lproj/Localizable.strings
index 313fb4225..6c8c86781 100644
--- a/UI/Scheduler/Welsh.lproj/Localizable.strings
+++ b/UI/Scheduler/Welsh.lproj/Localizable.strings
@@ -106,7 +106,7 @@
 "Sharing..." = "Rhannu...";
 "Export Calendar..." = "Allfudo Calendr...";
 "Import Events..." = "Import Events...";
-"Select file..." = "Select file...";
+"Select iCalendar file (*.ics)..." = "Select iCalendar file (*.ics)...";
 "Upload" = "Upload";
 "Publish Calendar..." = "Cyhoeddi Calendr...";
 "Reload Remote Calendars" = "Ail-lwytho Calendrau Anghysbell";
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index e5c714a2b..1d9198b20 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -100,7 +100,7 @@
 
   <div id="uploadDialog" style="display: none" class="dialog left">
     <div>
-      <h3><var:string label:value="Select file..."/></h3>
+      <h3><var:string label:value="Select iCalendar file (*.ics)..."/></h3>
       <form name="uploadForm" id="uploadForm" method="post"
         enctype="multipart/form-data"
         onsubmit="return AIM.submit(this, {'onStart' : validateUploadForm,