diff --git a/skins/default/mail.css b/skins/default/mail.css
index 733524adc..e3db160c8 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -613,11 +613,6 @@ table.headers-table tr td.subject
   font-weight: bold;
 }
 
-#attachment-list-div
-{
-  background: url(images/icons/attachment.png) 60px 2px no-repeat #DFDFDF;
-}
-
 #attachment-list
 {
   margin: 0px;
@@ -625,8 +620,9 @@ table.headers-table tr td.subject
   min-height: 16px;
   list-style-image: none;
   list-style-type: none;
+  background: url(images/icons/attachment.png) 60px 2px no-repeat #DFDFDF;
   /* IE6 hack */    
-  height: expression(Math.min(16, parseInt(document.documentElement.clientHeight))+'px');
+  _height: expression(Math.min(16, parseInt(document.documentElement.clientHeight))+'px');
 }
 
 #attachment-list:after
@@ -645,6 +641,7 @@ table.headers-table tr td.subject
   height: 18px;
   font-size: 11px;
   padding: 2px 0px 0px 15px;
+  white-space: nowrap;
 }
 
 #attachment-list li a
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 32e1abec8..1019a34ed 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -39,10 +39,8 @@
 
 <div class="messageheaderbox">
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/plus.gif" summary="Message headers" />
-<div id="attachment-list-div">
 <roundcube:object name="messageAttachments" id="attachment-list" />
 </div>
-</div>
 
 <roundcube:object name="blockedObjects" id="remote-objects-message" />
 <roundcube:object name="messageBody" id="messagebody" showImages="true" />
diff --git a/skins/default/templates/messagepreview.html b/skins/default/templates/messagepreview.html
index 06b4b27ec..e08f2c7ec 100644
--- a/skins/default/templates/messagepreview.html
+++ b/skins/default/templates/messagepreview.html
@@ -9,10 +9,8 @@
 
 <div class="messageheaderbox">
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/plus.gif" summary="Message headers" />
-<div id="attachment-list-div">
 <roundcube:object name="messageAttachments" id="attachment-list" />
 </div>
-</div>
 
 <roundcube:object name="blockedObjects" id="remote-objects-message" />
 <roundcube:object name="messageBody" id="messagebody" />