diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index e73b96444..0b51327ea 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -674,7 +674,7 @@
 {
   NSMutableArray *columnsDisplayOrder;
   NSMutableDictionary *columnsMetaData;
-  NSArray *userDefinedOrder;
+  NSMutableArray *userDefinedOrder;
   SOGoUserDefaults *ud;
   int i;
   
@@ -686,10 +686,15 @@
   }
   if ( [userDefinedOrder count] == 0 )
   {
-    userDefinedOrder = [NSArray arrayWithObjects: @"Invisible", @"Attachment", @"Subject", 
+    userDefinedOrder = [NSMutableArray arrayWithObjects: @"Invisible", @"Attachment", @"Subject", 
       @"From", @"Unread", @"Date", @"Priority", nil];
   }
   
+  if ( [self showToAddress] )
+  {
+    [userDefinedOrder replaceObjectAtIndex:[userDefinedOrder indexOfObjectIdenticalTo:@"From"] withObject:@"To"];
+  }
+  
   columnsMetaData = [self columnsMetaData];
   columnsDisplayOrder = [NSMutableArray array];
   
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index bbf67d98a..d52d8a86a 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -91,6 +91,16 @@
               /></var:if
             ></td
           ></var:if
+          ><var:if condition="currentColumn.value" const:value="To"
+            ><td class="messageAddressColumn"
+              ><var:if condition="showToAddress" const:negate="YES"
+                ><var:string value="message.envelope.from" formatter="context.mailEnvelopeAddressFormatter" 
+              /></var:if
+              ><var:if condition="showToAddress"
+                ><var:string value="message.envelope.to" formatter="context.mailEnvelopeAddressFormatter" 
+              /></var:if
+            ></td
+          ></var:if
           ><var:if condition="currentColumn.value" const:value="Unread"
             ><td class="messageFlagColumn"
               ><var:if condition="isMessageRead"