3 files changed, 14 insertions, 6 deletions
diff --git a/skins/default/mail.css b/skins/default/mail.css
index f6a769d1e..733524adc 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -613,16 +613,20 @@ 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;
-  padding: 0px 0px 0px 68px;
-  min-height: 18px;
+  padding: 0px 0px 0px 72px;
+  min-height: 16px;
   list-style-image: none;
   list-style-type: none;
-  background: url(images/icons/attachment.png) 52px 1px no-repeat #DFDFDF;
-  /* css hack for IE */
-  height: expression(Math.min(18, parseInt(document.documentElement.clientHeight))+'px');
+  /* IE6 hack */    
+  height: expression(Math.min(16, parseInt(document.documentElement.clientHeight))+'px');
 }
 
 #attachment-list:after
@@ -640,7 +644,7 @@ table.headers-table tr td.subject
   float: left;
   height: 18px;
   font-size: 11px;
-  padding: 2px 10px 0px 10px;
+  padding: 2px 0px 0px 15px;
 }
 
 #attachment-list li a
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 1019a34ed..32e1abec8 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -39,8 +39,10 @@
 
 <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 e08f2c7ec..06b4b27ec 100644
--- a/skins/default/templates/messagepreview.html
+++ b/skins/default/templates/messagepreview.html
@@ -9,8 +9,10 @@
 
 <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" />