diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index 2af79ef9..fa12d9f6 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -792,7 +792,7 @@ function rcube_kolab_notes_ui(settings)
                     .addClass('message eml')
                     .append($('<a>')
                         .attr('href', link.mailurl)
-                        .addClass('messagelink')
+                        .addClass('messagelink filename')
                         .text(link.subject || link.uri)
                     )
                     .appendTo(attachmentslist);
diff --git a/plugins/kolab_notes/skins/elastic/templates/dialogview.html b/plugins/kolab_notes/skins/elastic/templates/dialogview.html
index 7eb00f29..46ca4c31 100644
--- a/plugins/kolab_notes/skins/elastic/templates/dialogview.html
+++ b/plugins/kolab_notes/skins/elastic/templates/dialogview.html
@@ -11,7 +11,7 @@
 	<roundcube:object name="plugin.editform" id="noteform" class="noteform" />
 	<roundcube:object name="plugin.detailview" id="notedetails" class="notedetails" />
 	<div id="notereferences">
-		<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
+		<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist linkslist" />
 	</div>
 </div>
 
diff --git a/plugins/kolab_notes/skins/elastic/templates/notes.html b/plugins/kolab_notes/skins/elastic/templates/notes.html
index 8df79a69..0ec63fdc 100644
--- a/plugins/kolab_notes/skins/elastic/templates/notes.html
+++ b/plugins/kolab_notes/skins/elastic/templates/notes.html
@@ -76,7 +76,7 @@
 			<roundcube:object name="plugin.detailview" id="notedetails" class="notedetails" />
 			<h3 id="aria-label-messagereferences" class="voice"><roundcube:label name="kolab_notes.arialabelmessagereferences" /></h3>
 			<div id="notereferences" class="notereferences" role="region" aria-labelledby="aria-label-messagereferences">
-				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
+				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist linkslist" />
 			</div>
 			<roundcube:container name="notedetailview" id="notedetailsbox" />
 		</div>
diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index 0cd41260..efde7685 100644
--- a/plugins/libcalendaring/libcalendaring.js
+++ b/plugins/libcalendaring/libcalendaring.js
@@ -1106,7 +1106,7 @@ function rcube_libcalendaring(settings)
     // Render message reference links to the given container
     this.render_message_links = function(links, container, edit, plugin)
     {
-        var ul = $('<ul>').addClass('attachmentslist');
+        var ul = $('<ul>').addClass('attachmentslist linkslist');
 
         $.each(links, function(i, link) {
             if (!link.mailurl)
@@ -1115,7 +1115,7 @@ function rcube_libcalendaring(settings)
             var li = $('<li>').addClass('link')
                 .addClass('message eml')
                 .append($('<a>')
-                    .attr({href: link.mailurl, 'class': 'messagelink'})
+                    .attr({href: link.mailurl, 'class': 'messagelink filename'})
                     .text(link.subject || link.uri)
                 )
                 .appendTo(ul);
diff --git a/plugins/libkolab/skins/elastic/include/libcalendaring.less b/plugins/libkolab/skins/elastic/include/libcalendaring.less
index d0fff594..40a47e88 100644
--- a/plugins/libkolab/skins/elastic/include/libcalendaring.less
+++ b/plugins/libkolab/skins/elastic/include/libcalendaring.less
@@ -361,21 +361,6 @@
     }
 }
 
-.attachmentslist li.link {
-    &.message.eml:before {
-        content: @fa-var-envelope;
-    }
-
-    a.messagelink {
-        .overflow-ellipsis;
-        margin-right: .25rem;
-    }
-
-    a.delete .inner {
-        display: none;
-    }
-}
-
 .attachmentslist li.ics:before,
 .attachmentslist li.text.calendar:before,
 .messagelist tbody .attachment span.ical:before {
diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
index a3dbe01b..645850c5 100644
--- a/plugins/libkolab/skins/elastic/libkolab.less
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -416,6 +416,28 @@ button.btn {
     color: @color-black-shade-text;
 }
 
+.linkslist {
+    // Reset .attachmentslist style
+    border: 0 !important;
+    background: transparent !important;
+
+    li.link {
+        padding: 0;
+
+        &.message.eml:before {
+            content: @fa-var-envelope;
+        }
+
+        a.messagelink {
+            .overflow-ellipsis;
+        }
+
+        a.delete .inner {
+            display: none;
+        }
+    }
+}
+
 .print-config {
     position: fixed;
     top: 0;