diff --git a/ChangeLog b/ChangeLog
index 9f8d8b7c7..586fefd00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-24  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Scheduler/UIxCalFolderActions.m (-importAction): failback to
+	latin-1 when utf-8 decoding doesn't work.
+
 2012-01-19  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxMailToSelection.js
diff --git a/NEWS b/NEWS
index dd09826b0..538b59e98 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Enhancements
  - updated Ukrainian translation
  - now possible to use memcached over a UNIX socket
  - increase size of content columns
+ - improved import of .ics files
 
 Bug Fixes
  - alarms for tasks now depend on the start date and instead of the due date
diff --git a/UI/Scheduler/UIxCalFolderActions.m b/UI/Scheduler/UIxCalFolderActions.m
index 75a8c6a68..abe0b3400 100644
--- a/UI/Scheduler/UIxCalFolderActions.m
+++ b/UI/Scheduler/UIxCalFolderActions.m
@@ -72,6 +72,9 @@
     {
       fileContent = [[NSString alloc] initWithData: (NSData *) data 
                                           encoding: NSUTF8StringEncoding];
+      if (fileContent == nil)
+        fileContent = [[NSString alloc] initWithData: (NSData *) data 
+                                            encoding: NSISOLatin1StringEncoding];
       [fileContent autorelease];
     }