diff --git a/ChangeLog b/ChangeLog
index 67fcdcf36..fdb7a87bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-25  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SOPE/GDLContentStore/GCSFolder.m - we now use the proper
+	method to determine column types, avoiding the generation
+	of broken UPDATE statements on MySQL when snoozing alarms.
+
+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/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m
index 51a931f7f..8361ca683 100644
--- a/SOPE/GDLContentStore/GCSFolder.m
+++ b/SOPE/GDLContentStore/GCSFolder.m
@@ -832,7 +832,7 @@ andAttribute: (EOAttribute *)_attribute
   EOSQLQualifier *qualifier;
   EOAttribute *attribute1, *attribute2;
 
-  attribute1 = [_entity attributeNamed: _colname];
+  attribute1 = [self _attributeForColumn: _colname];
   if (_colname2 == nil)
     {
       qualifier = [[EOSQLQualifier alloc] initWithEntity: _entity
@@ -842,7 +842,7 @@ andAttribute: (EOAttribute *)_attribute
     }
   else
     {
-      attribute2 = [_entity attributeNamed: _colname2];
+      attribute2 = [self _attributeForColumn: _colname2];
       qualifier = [[EOSQLQualifier alloc] initWithEntity: _entity
 					  qualifierFormat: @"%A = %@ AND %A = %@",
                                           _colname,
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];
     }
 
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index f75a38cf8..4b4a956c4 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -745,7 +745,7 @@ _userStateInEvent (NSArray *event)
 		  [currentDay addObject: eventBlock];
 		}
 	      else
-		[self warnWithFormat: @"event '%@' has end < start: %d < %d",
+		[self warnWithFormat: @"event '%@' has end <= start: %d < %d",
 		      [event objectAtIndex: eventNameIndex], eventEnd, currentStart];
 	    }
         }