diff --git a/mail/base/content/msgHdrViewOverlay.js b/mail/base/content/msgHdrViewOverlay.js
index 3075b30a3720..3401d66b1b02 100644
--- a/mail/base/content/msgHdrViewOverlay.js
+++ b/mail/base/content/msgHdrViewOverlay.js
@@ -1245,6 +1245,9 @@ function displayAttachmentsForExpandedView()
     // the attachment view and we end up with a box that is too tall.
     expandedAttachmentBox.collapsed = false;
     attachmentSplitter.collapsed = false;
+    
+    if (gShowLargeAttachmentView)
+      expandedAttachmentBox.setAttribute("largeView", "true");
 
     // Remove height attribute, or the attachments box could be drawn badly:
     expandedAttachmentBox.removeAttribute("height");
@@ -1260,10 +1263,7 @@ function displayAttachmentsForExpandedView()
       attachmentView.setAttribute("class", "descriptionitem-iconic"); 
 
       if (gShowLargeAttachmentView)
-      {
         attachmentView.setAttribute("largeView", "true");
-        attachmentView.setAttribute("orient", "vertical");
-      }
 
       setApplicationIconForAttachment(attachment, attachmentView, gShowLargeAttachmentView);
       attachmentView.setAttribute("tooltip", "attachmentListTooltip");
diff --git a/mail/themes/pinstripe/mail/messageHeader.css b/mail/themes/pinstripe/mail/messageHeader.css
index ae32b3322c74..58c95d2a5aed 100644
--- a/mail/themes/pinstripe/mail/messageHeader.css
+++ b/mail/themes/pinstripe/mail/messageHeader.css
@@ -102,10 +102,9 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   width: 15em;
 }
 
-.attachmentBox[largeView="true"]
+#attachmentView[largeView="true"] .attachmentBox
 {
-  -moz-box-align: center;
-  -moz-box-pack: center;
+  -moz-box-orient: vertical;
 }
 
 #attachmentView
@@ -115,6 +114,11 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   -moz-border-radius: 7px;
   margin: 0px 6px 6px 6px;
   padding: 4px;  
+  min-height: 30px;
+}
+
+#attachmentView[largeView="true"]
+{
   min-height: 60px;
 }
 
diff --git a/mail/themes/qute/mail/messageHeader.css b/mail/themes/qute/mail/messageHeader.css
index facb0bbd5252..660fda2eb794 100644
--- a/mail/themes/qute/mail/messageHeader.css
+++ b/mail/themes/qute/mail/messageHeader.css
@@ -100,13 +100,17 @@ description[selectable="true"]:focus > descriptionitem[selected="true"]
   width: 15em;
 }
 
-.attachmentBox[largeView="true"]
+#attachmentView[largeView="true"] .attachmentBox
 {
-  -moz-box-align: center;
-  -moz-box-pack: center;
+  -moz-box-orient: vertical;
 }
 
 #attachmentView
+{
+  min-height: 30px;
+}
+
+#attachmentView[largeView="true"]
 {
   min-height: 55px;
 }