diff --git a/UI/Templates/MailerUI/UIxMailView.wox b/UI/Templates/MailerUI/UIxMailView.wox
index a91268aea..e211cd644 100644
--- a/UI/Templates/MailerUI/UIxMailView.wox
+++ b/UI/Templates/MailerUI/UIxMailView.wox
@@ -40,29 +40,29 @@
       </tr>
 
       <tr class="mailer_fieldrow">
-        <td class="mailer_fieldname"><var:string label:value="To"/>:</td>
+        <td class="mailer_fieldname"><img rsrc:src="plus.png" class="collapse" style="display: none;" /><var:string label:value="To"/>:</td>
         <td class="mailer_fieldvalue">
-          <var:foreach list="clientObject.toEnvelopeAddresses"
+          <span class="collapse"><var:foreach list="clientObject.toEnvelopeAddresses"
             item="currentAddress"
             ><a var:href="currentAddressLink">
               <var:string value="currentAddress"
                 formatter="context.mailEnvelopeFullAddressFormatter"
                 /></a>
-          </var:foreach>
+          </var:foreach></span>
         </td>
       </tr>
       <var:if condition="hasCC">
         <tr class="mailer_fieldrow">
-          <td class="mailer_fieldname"><var:string label:value="CC"/>:</td>
+          <td class="mailer_fieldname"><img rsrc:src="plus.png" class="collapse" style="display: none;" /><var:string label:value="CC"/>:</td>
           <td class="mailer_fieldvalue">
-            <var:foreach list="clientObject.ccEnvelopeAddresses" 
+            <span class="collapse"><var:foreach list="clientObject.ccEnvelopeAddresses" 
               item="currentAddress">
               <a var:href="currentAddressLink"
 		><var:string value="currentAddress"
                   formatter="context.mailEnvelopeFullAddressFormatter"
                   /></a>
               <!-- TODO: better to use li+CSS -->
-            </var:foreach>
+            </var:foreach></span>
           </td>
         </tr>
       </var:if>
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index 443e5c9fc..56973864f 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -384,6 +384,15 @@ DIV.mailer_mailcontent TABLE
   table-layout: auto;
 }
 
+/* collapsable header */
+TD.mailer_fieldname IMG
+{ cursor: pointer;
+  padding-right: 5px; }
+TD.mailer_fieldvalue SPAN.collapse
+{ white-space: nowrap; }
+TD.mailer_fieldvalue SPAN.expand
+{ white-space: normal; }
+
 TD.mailer_fieldname
 {
   white-space: nowrap;
@@ -395,9 +404,7 @@ TD.mailer_fieldname
 }
 
 TD.mailer_fieldvalue
-{
-  vertical-align: top;
-}
+{ vertical-align: top; }
 
 TD.mailer_subjectfieldvalue
 {
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 5bee22dca..42ea0f229 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -850,6 +850,38 @@ function resizeMailContent() {
   
   contentDiv.setStyle({ 'top':
 	(Element.getHeight(headerTable) + headerTable.offsetTop) + 'px' });
+
+  // Show expand buttons if necessary
+  var spans = $$("TABLE TR.mailer_fieldrow TD.mailer_fieldvalue SPAN");
+  spans.each(function(span) {
+        var row = span.up("TR");
+        if (span.getWidth() > row.getWidth()) {
+           var cell = row.select("TD.mailer_fieldname").first();
+           var link = cell.down("img");
+           link.show();
+           link.observe("click", toggleDisplayHeader);
+        }
+     });
+}
+
+function toggleDisplayHeader(event) {
+   var row = this.up("TR");
+   var span = row.down("SPAN");
+   
+   if (this.hasClassName("collapse")) {
+      this.writeAttribute("src", ResourcesURL + '/minus.png');
+      this.writeAttribute("class", "expand");
+      span.writeAttribute("class", "expand");
+   }
+   else {
+      this.writeAttribute("src", ResourcesURL + '/plus.png');
+      this.writeAttribute("class", "collapse");
+      span.writeAttribute("class", "collapse");
+   }
+   resizeMailContent();
+
+   preventDefault(event);
+   return false;
 }
 
 function onMessageContentMenu(event) {
@@ -1030,8 +1062,8 @@ function expandUpperTree(node) {
       var id = currentNode.getAttribute("id");
       var number = parseInt(id.substr(2));
       if (number > 0) {
-	var cn = mailboxTree.aNodes[number];
-	mailboxTree.nodeStatus(1, number, cn._ls);
+         var cn = mailboxTree.aNodes[number];
+         mailboxTree.nodeStatus(1, number, cn._ls);
       }
     }
     currentNode = currentNode.parentNode;
@@ -1168,8 +1200,8 @@ function configureMessageListBodyEvents(table) {
     if ($(cell).hasClassName("tbtv_navcell")) {
       var anchors = $(cell).childNodesWithTag("a");
       for (var i = 0; i < anchors.length; i++)
-	Event.observe(anchors[i], "click",
-		      openMailboxAtIndex.bindAsEventListener(anchors[i]));
+         Event.observe(anchors[i], "click",
+                       openMailboxAtIndex.bindAsEventListener(anchors[i]));
     }
 
     rows = table.tBodies[0].rows;
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 6002554cc..832d5cacf 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -505,9 +505,9 @@ function onRowClick(event) {
     var list = node.parentNode;
     var items = list.childNodesWithTag("li");
     for (var i = 0; i < items.length; i++) {
-      if (items[i] == node) {
-	rowIndex = i;
-	break;
+       if (items[i] == node) {
+          rowIndex = i;
+          break;
       }
     }
   }