diff --git a/ChangeLog b/ChangeLog
index 3a8c7a25e..549347be1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailerUI/UIxMailSortableTableHeader.m
+	([UIxMailSortableTableHeader -isSortedDescending]): same as below.
+
+	* UI/MailerUI/UIxMailListView.m ([UIxMailListView
+	-isSortedDescending]): defaults to "YES" when the sort order is
+	not specified.
+
 2006-07-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/MailerUI.js:
diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index 66adde3d9..4748dccaa 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -177,30 +177,34 @@ static int attachmentFlagSize = 8096;
   NSString *sort;
   
   sort = [[[self context] request] formValueForKey:@"sort"];
-  
+
   if ([sort length] == 0)
     sort = [self defaultSortKey];
+
   return [sort uppercaseString];
 }
 
-- (BOOL) isSortedDescending 
+- (BOOL) isSortedDescending
 {
   NSString *desc;
-  
+
   desc = [[[self context] request] formValueForKey:@"desc"];
-  if(!desc)
-    return NO;
-  return [desc boolValue] ? YES : NO;
+
+  return ((desc)
+          ? [desc boolValue]
+          : YES);
 }
 
 - (NSString *) imap4SortOrdering 
 {
   NSString *sort;
-  
+
   sort = [self imap4SortKey];
-  if(![self isSortedDescending])
-    return sort;
-  return [@"REVERSE " stringByAppendingString:sort];
+
+  if ([self isSortedDescending])
+    sort = [@"REVERSE " stringByAppendingString: sort];
+
+  return sort;
 }
 
 - (NSRange) fetchRange 
@@ -212,12 +216,13 @@ static int attachmentFlagSize = 8096;
 
 - (NSArray *) sortedUIDs 
 {
-  if (self->sortedUIDs != nil)
-    return self->sortedUIDs;
-  
-  self->sortedUIDs 
-    = [[[self clientObject] fetchUIDsMatchingQualifier:[self qualifier]
-			    sortOrdering:[self imap4SortOrdering]] retain];
+  if (!sortedUIDs)
+    {
+      sortedUIDs 
+        = [[self clientObject] fetchUIDsMatchingQualifier: [self qualifier]
+                               sortOrdering: [self imap4SortOrdering]];
+      [sortedUIDs retain];
+    }
 
   return self->sortedUIDs;
 }
@@ -487,7 +492,7 @@ static int attachmentFlagSize = 8096;
 - (id) defaultAction 
 {
   WORequest *request;
-  NSValue *specificMessage;
+  NSString *specificMessage;
 
   request = [[self context] request];
   specificMessage = [request formValueForKey: @"pageforuid"];
diff --git a/UI/MailerUI/UIxMailSortableTableHeader.m b/UI/MailerUI/UIxMailSortableTableHeader.m
index 3aa78e34b..d5920bd79 100644
--- a/UI/MailerUI/UIxMailSortableTableHeader.m
+++ b/UI/MailerUI/UIxMailSortableTableHeader.m
@@ -105,22 +105,26 @@
 
 /* derived accessors */
 
-- (BOOL)isSelected {
+- (BOOL) isSelected
+{
   NSString *so;
-  
-  if ((so = [self singleQueryValueForKey:@"sort"]) == nil)
-    return self->isDefault;
-  
-  return [so isEqualToString:self->sortKey];
+ 
+  so = [self singleQueryValueForKey:@"sort"];
+
+  return ((so)
+          ? [so isEqualToString:self->sortKey]
+          : isDefault);
 }
 
-- (BOOL)isSortedDescending {
+- (BOOL)isSortedDescending
+{
   NSString *desc;
 
-  if ((desc = [self singleQueryValueForKey:@"desc"]) == nil)
-    return NO;
-  
-  return [desc boolValue];
+  desc = [[[self context] request] formValueForKey:@"desc"];
+
+  return ((desc)
+          ? [desc boolValue]
+          : YES);
 }
 
 @end /* UIxMailSortableTableHeader */