diff --git a/ChangeLog b/ChangeLog
index 3d05fc45e..f3fb1e0b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-24  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/MailerUI/UIxMailListActions.m (-imap4SortOrdering): verify
+	that the sort is defined when rollbacking to the user's settings.
+
 2011-03-23  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentObject.m (-PUTAction:):
diff --git a/UI/MailerUI/UIxMailListActions.m b/UI/MailerUI/UIxMailListActions.m
index ee59114e7..1860ac02d 100644
--- a/UI/MailerUI/UIxMailListActions.m
+++ b/UI/MailerUI/UIxMailListActions.m
@@ -384,10 +384,13 @@
   else if (moduleSettings)
     {
       NSArray *sortState = [moduleSettings objectForKey: @"SortingState"];
-      sort = [[sortState objectAtIndex: 0] uppercaseString];
-      asc = [[sortState objectAtIndex: 1] boolValue];
+      if ([sortState count])
+	{
+	  sort = [[sortState objectAtIndex: 0] uppercaseString];
+	  asc = [[sortState objectAtIndex: 1] boolValue];
+	}
     }
-  else
+  if (![sort length])
     sort = [self defaultSortKey];
   
   // Construct and return the final IMAP ordering constraint