3 files changed, 6 insertions, 5 deletions
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index b8cc9f351..43367749c 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -1592,10 +1592,9 @@ input.from_address
 #compose-attachments ul li
 {
   height: 18px;
+  line-height: 16px;
   font-size: 11px;
-  padding-left: 2px;
-  padding-top: 2px;
-  padding-right: 4px;
+  padding: 2px 2px 1px 2px;
   border-bottom: 1px solid #EBEBEB;
   white-space: nowrap;
   overflow: hidden;
@@ -1608,8 +1607,10 @@ input.from_address
   text-indent: -5000px;
   width: 17px;
   height: 16px;
+  padding-bottom: 2px;
   display: inline-block;
   text-decoration: none;
+  vertical-align: middle;
 }
 
 #compose-attachments li img
diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html
index 757c0a635..bd4fbf277 100644
--- a/skins/classic/templates/message.html
+++ b/skins/classic/templates/message.html
@@ -49,7 +49,7 @@
   </div>
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
 <roundcube:object name="messageFullHeaders" id="full-headers" />
-<roundcube:object name="messageAttachments" id="attachment-list" />
+<roundcube:object name="messageAttachments" id="attachment-list" maxlength="50" />
 <roundcube:object name="messageObjects" id="message-objects" />
 <roundcube:object name="messageBody" id="messagebody" />
 </div>
diff --git a/skins/classic/templates/messagepreview.html b/skins/classic/templates/messagepreview.html
index b42a06342..82414c420 100644
--- a/skins/classic/templates/messagepreview.html
+++ b/skins/classic/templates/messagepreview.html
@@ -20,7 +20,7 @@
   </div>
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
 <roundcube:object name="messageFullHeaders" id="full-headers" />
-<roundcube:object name="messageAttachments" id="attachment-list" />
+<roundcube:object name="messageAttachments" id="attachment-list" maxlength="50" />
 </div>
 
 <roundcube:object name="messageObjects" id="message-objects" />