diff --git a/ChangeLog b/ChangeLog
index 277457780..e32b66a51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* UI/WebServerResources/MailerUI.js: Added drag & drop support!
 	* UI/MailPartViewers/UIxMailPartHTMLViewer.m: Removed an extra NSLog
+	* UI/MailerUI/UIxMailListView.m: Added support for "Size" column, fixed a
+	bug when number of columns != 7.
 
 2009-06-29  Cyril Robert <crobert@inverse.ca>
 
diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index e560af6c4..8ec17ca3a 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -110,6 +110,18 @@
   return [dateFormatter formattedDateAndTime: messageDate];
 }
 
+- (NSString *) messageSize
+{
+  NSString *rc;
+  int size;
+
+  size = [[message valueForKey: @"size"] intValue];
+
+  rc = [NSString stringWithFormat: @"%dK", size/1024];
+
+  return rc;
+}
+
 //
 // Priorities are defined like this:
 //
@@ -651,7 +663,7 @@
   searchValue = [request formValueForKey: @"value"];
   if ([searchValue length])
     [self _setQualifierForCriteria: searchCriteria
-	  andValue: searchValue];
+                          andValue: searchValue];
 
   firstMessageNumber
     = ((specificMessage)
@@ -761,6 +773,13 @@
   [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
 					    forKeys: tmpKeys]
 		   forKey: @"Priority"];
+
+  tmpColumns
+    = [NSArray arrayWithObjects: @"tbtv_headercell", @"sizeHeader",
+	       @"Size", nil];
+  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
+					    forKeys: tmpKeys]
+		   forKey: @"Size"];
   
   return columnsMetaData;
 }
@@ -777,11 +796,11 @@
   if (![defaultsOrder count])
     {
       defaultsOrder = [[NSUserDefaults standardUserDefaults]
-			arrayForKey: @"SOGoMailListViewColumnsOrder"];
+        arrayForKey: @"SOGoMailListViewColumnsOrder"];
       if (![defaultsOrder count])
-	defaultsOrder = [NSArray arrayWithObjects: @"Invisible",
-				 @"Attachment", @"Subject", @"From",
-				 @"Unread", @"Date", @"Priority", nil];
+        defaultsOrder = [NSArray arrayWithObjects: @"Invisible",
+                      @"Attachment", @"Subject", @"From",
+                      @"Unread", @"Date", @"Priority", nil];
     }
   userDefinedOrder = [NSMutableArray arrayWithArray: defaultsOrder];
 
@@ -802,6 +821,11 @@
 				 notFoundMarker: @""];
 }
 
+- (NSString *) columnsDisplayCount
+{
+  return [NSString stringWithFormat: @"%d", [[self columnsDisplayOrder] count]];
+}
+
 - (NSString *) columnTitle
 {
   return [self labelForKey: [currentColumn objectForKey: @"value"]];
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index 40c6a9451..e47b64c5a 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -31,7 +31,7 @@
       </var:foreach>
       </tr>
     <tr class="tableview"
-      ><td colspan="7" class="tbtv_navcell"
+      ><td var:colspan="columnsDisplayCount" class="tbtv_navcell"
 	><var:if condition="hasPrevious">
 	  <a href="#"
 	    idx="1"><var:string label:value="first"/></a> |
@@ -132,6 +132,12 @@
                 ><var:string value="messagePriority" 
                 /><entity name="nbsp"
                 /></td
+            ></var:if
+          ><var:if condition="currentColumn.value" const:value="Size"
+              ><td class="messagePriorityColumn"
+                ><var:string value="messageSize" 
+                /><entity name="nbsp"
+                /></td
                 ></var:if>
             </var:foreach>
           </tr>