diff --git a/ChangeLog b/ChangeLog
index 97113cff4..cf28e2471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailerUI/UIxMailListView.m ([UIxMailListView
+	-columnsDisplayOrder]): slightly optimized method by reducing the
+	amount of method calls. Initialized userDefinedOrder as an
+	NSMutableArray instead of an NSArray. Fixed indentation.
+
+	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -davURL])
+	([SOGoObject -soURL]): appended the port number to the hostname
+	used to construct the NSURL instance.
+
 2008-10-03  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/MainUI/SOGoUserHomePage.m ([WOResponse
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 473e8cf5f..6a2bbf7c0 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -1164,7 +1164,7 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
 {
   NSURL *serverURL, *url;
   NSMutableArray *path;
-  NSString *baseURL, *urlMethod;
+  NSString *baseURL, *urlMethod, *fullHost;
 
   serverURL = [context serverURL];
   baseURL = [[self baseURLInContext: context] stringByUnescapingURL];
@@ -1185,8 +1185,10 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
 	[path insertObject: expected atIndex: 2];
     }
 
+  fullHost = [NSString stringWithFormat: @"%@:%@",
+		       [serverURL host], [serverURL port]];
   url = [[NSURL alloc] initWithScheme: [serverURL scheme]
-		       host: [serverURL host]
+		       host: fullHost
 		       path: [path componentsJoinedByString: @"/"]];
   [url autorelease];
 
diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings
index 34e804204..bac1d304c 100644
--- a/UI/MailerUI/French.lproj/Localizable.strings
+++ b/UI/MailerUI/French.lproj/Localizable.strings
@@ -87,7 +87,7 @@
 
 "Attachments:" = "Pièces jointes :";
 
-"To"            = "Pour";
+"To"            = "Destinataire";
 "Cc"            = "Copie à";
 "Bcc"           = "Copie cachée à";
 
diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index 5370b77d1..429062607 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -31,6 +31,7 @@
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSTimeZone.h>
+#import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/WOResponse.h>
@@ -670,92 +671,108 @@
   return [labels componentsJoinedByString: @" "];
 }
 
-- (NSArray *) columnsDisplayOrder
-{
-  NSMutableArray *columnsDisplayOrder;
-  NSMutableDictionary *columnsMetaData;
-  NSMutableArray *userDefinedOrder;
-  SOGoUserDefaults *ud;
-  int i;
-  
-  ud = [[context activeUser] userSettings];
-  userDefinedOrder = [NSArray arrayWithArray: [ud arrayForKey: @"SOGoMailListViewColumnsOrder"]];
-  if ( [userDefinedOrder count] == 0 )
-  {
-    userDefinedOrder = [NSMutableArray arrayWithArray:
-      [[NSUserDefaults standardUserDefaults] arrayForKey: @"SOGoMailListViewColumnsOrder"]];
-  }
-  if ( [userDefinedOrder count] == 0 )
-  {
-    userDefinedOrder = [NSMutableArray arrayWithObjects: @"Invisible", @"Attachment", @"Subject", 
-      @"From", @"Unread", @"Date", @"Priority", nil];
-  }
-  
-  if ( [self showToAddress] )
-  {
-    i = [userDefinedOrder indexOfObject:@"From"];
-    if ( i >= 0 && i < [userDefinedOrder count] )
-    {
-      [userDefinedOrder replaceObjectAtIndex:i withObject:@"To"];
-    }
-  }
-  else
-  {
-    i = [userDefinedOrder indexOfObject:@"To"];
-    if ( i >= 0 && i < [userDefinedOrder count] )
-    {
-      [userDefinedOrder replaceObjectAtIndex:i withObject:@"From"];
-    }
-    
-  }
-  
-  columnsMetaData = [self columnsMetaData];
-  columnsDisplayOrder = [NSMutableArray array];
-  
-  for(i = 0; i < [userDefinedOrder count]; i += 1)
-  {
-    [columnsDisplayOrder addObject: 
-      [columnsMetaData objectForKey: 
-        [userDefinedOrder objectAtIndex: i]]];
-  }
-
-  return columnsDisplayOrder;
-}
-
 - (NSDictionary *) columnsMetaData
 {
   NSMutableDictionary *columnsMetaData;
   NSArray *tmpColumns, *tmpKeys;
+
   columnsMetaData = [NSMutableDictionary dictionaryWithCapacity:8];
   
-  tmpKeys = [NSArray arrayWithObjects: @"headerClass", @"headerId", @"value", nil];
-  tmpColumns = [NSArray arrayWithObjects: @"tbtv_headercell sortableTableHeader", @"subjectHeader", @"Subject", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns forKeys: tmpKeys] forKey: @"Subject"];
-  
-  tmpColumns = [NSArray arrayWithObjects: @"tbtv_headercell messageFlagColumn", @"invisibleHeader", @"Invisible", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns forKeys: tmpKeys] forKey: @"Invisible"];
+  tmpKeys = [NSArray arrayWithObjects: @"headerClass", @"headerId", @"value",
+		     nil];
+  tmpColumns
+    = [NSArray arrayWithObjects: @"tbtv_headercell sortableTableHeader",
+	       @"subjectHeader", @"Subject", nil];
+  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
+					    forKeys: tmpKeys]
+		   forKey: @"Subject"];
 
-  tmpColumns = [NSArray arrayWithObjects: @"tbtv_headercell messageFlagColumn", @"attachmentHeader", @"Attachment", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns forKeys: tmpKeys] forKey: @"Attachment"];
+  tmpColumns
+    = [NSArray arrayWithObjects: @"tbtv_headercell messageFlagColumn",
+	       @"invisibleHeader", @"Invisible", nil];
+  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
+					    forKeys: tmpKeys]
+		   forKey: @"Invisible"];
 
-  tmpColumns = [NSArray arrayWithObjects: @"tbtv_headercell", @"messageFlagHeader", @"Unread", nil];
+  tmpColumns
+    = [NSArray arrayWithObjects: @"tbtv_headercell messageFlagColumn",
+	       @"attachmentHeader", @"Attachment", nil];
+  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects:
+					      tmpColumns
+					    forKeys: tmpKeys]
+		   forKey: @"Attachment"];
+
+  tmpColumns
+    = [NSArray arrayWithObjects: @"tbtv_headercell", @"messageFlagHeader",
+	       @"Unread", nil];
   [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns forKeys: tmpKeys] forKey: @"Unread"];
-  
-  tmpColumns = [NSArray arrayWithObjects: @"tbtv_headercell sortableTableHeader", @"toHeader", @"To", nil];
+
+  tmpColumns
+    = [NSArray arrayWithObjects: @"tbtv_headercell sortableTableHeader",
+	       @"toHeader", @"To", nil];
   [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns forKeys: tmpKeys] forKey: @"To"];
 
-  tmpColumns = [NSArray arrayWithObjects: @"tbtv_headercell sortableTableHeader", @"fromHeader", @"From", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns forKeys: tmpKeys] forKey: @"From"];
+  tmpColumns
+    = [NSArray arrayWithObjects: @"tbtv_headercell sortableTableHeader",
+	       @"fromHeader", @"From", nil];
+  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
+					    forKeys: tmpKeys]
+		   forKey: @"From"];
   
-  tmpColumns = [NSArray arrayWithObjects: @"tbtv_headercell sortableTableHeader", @"dateHeader", @"Date", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns forKeys: tmpKeys] forKey: @"Date"];
+  tmpColumns
+    = [NSArray arrayWithObjects: @"tbtv_headercell sortableTableHeader",
+	       @"dateHeader", @"Date", nil];
+  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
+					    forKeys: tmpKeys]
+		   forKey: @"Date"];
   
-  tmpColumns = [NSArray arrayWithObjects: @"tbtv_headercell", @"priorityHeader", @"Priority", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns forKeys: tmpKeys] forKey: @"Priority"];
+  tmpColumns
+    = [NSArray arrayWithObjects: @"tbtv_headercell", @"priorityHeader",
+	       @"Priority", nil];
+  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
+					    forKeys: tmpKeys]
+		   forKey: @"Priority"];
   
   return columnsMetaData;
 }
 
+- (NSArray *) columnsDisplayOrder
+{
+  NSMutableArray *userDefinedOrder;
+  NSArray *defaultsOrder;
+  NSUserDefaults *ud;
+  unsigned int i;
+
+  ud = [[context activeUser] userSettings];
+  defaultsOrder = [ud arrayForKey: @"SOGoMailListViewColumnsOrder"];
+  if (![defaultsOrder count])
+    {
+      defaultsOrder = [[NSUserDefaults standardUserDefaults]
+			arrayForKey: @"SOGoMailListViewColumnsOrder"];
+      if (![defaultsOrder count])
+	defaultsOrder = [NSArray arrayWithObjects: @"Invisible",
+				 @"Attachment", @"Subject", @"From",
+				 @"Unread", @"Date", @"Priority", nil];
+    }
+  userDefinedOrder = [NSMutableArray arrayWithArray: defaultsOrder];
+
+  if ([self showToAddress])
+    {
+      i = [userDefinedOrder indexOfObject: @"From"];
+      if (i != NSNotFound)
+	[userDefinedOrder replaceObjectAtIndex: i withObject: @"To"];
+    }
+  else
+    {
+      i = [userDefinedOrder indexOfObject: @"To"];
+      if (i != NSNotFound)
+	[userDefinedOrder replaceObjectAtIndex: i withObject: @"From"];
+    }
+
+  return [[self columnsMetaData] objectsForKeys: userDefinedOrder
+				 notFoundMarker: @""];
+}
+
 - (NSString *) columnTitle
 {
   return [self labelForKey: [currentColumn objectForKey: @"value"]];