diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index ee6e0eab1..f02453d4f 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -190,7 +190,6 @@ td.editfield { width: 99%;  /* TODO */ }
     }
 
     .attachmentslist {
-        padding: 0;
         list-style: none;
 
         li {
diff --git a/skins/elastic/styles/widgets/lists.less b/skins/elastic/styles/widgets/lists.less
index bc070f87d..5d0f3c039 100644
--- a/skins/elastic/styles/widgets/lists.less
+++ b/skins/elastic/styles/widgets/lists.less
@@ -541,6 +541,7 @@ table.fixedcopy {
         &:extend(.font-icon-class);
 
         &:before {
+            margin: 0;
             content: @fa-var-paperclip;
         }
         &.report:before {
@@ -549,6 +550,9 @@ table.fixedcopy {
         &.encrypted:before {
             content: @fa-var-lock;
         }
+        &.vcard:before {
+            content: @fa-var-user-o; /* vcard_attachments plugin */
+        }
     }
 
     span.flagged:before {
@@ -582,6 +586,9 @@ html.touch {
 
 /* Attachments list */
 
+.attachmentslist {
+    padding: 0;
+}
 .attachmentslist li {
     display: inline-block;
     line-height: 1.25em;
diff --git a/skins/elastic/styles/widgets/messages.less b/skins/elastic/styles/widgets/messages.less
index 021bffc87..2ec0a39a4 100644
--- a/skins/elastic/styles/widgets/messages.less
+++ b/skins/elastic/styles/widgets/messages.less
@@ -77,4 +77,23 @@
     &.alert-danger > i.icon:before {
         content: @fa-var-exclamation-circle;
     }
+
+    &.vcardattachment > i.icon:before {
+        content: @fa-var-vcard; /* vcard_attachments plugin */
+    }
+
+    /* This works with following structure: <i> <span> [button].
+       <span> here is a one-line text, and button can be anything but <span>.
+     */
+    &.aligned-buttons {
+        display: flex;
+
+        span {
+            flex: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            line-height: 2.6;
+        }
+    }
 }
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 134c2cf01..35184eafc 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -501,8 +501,8 @@ function rcube_elastic_ui()
         });
 
         // Make message-objects alerts pretty (the same as UI alerts)
-        $('#message-objects').children('div').each(function() {
-            alert_style(this, $(this).attr('class'));
+        $('#message-objects').children().each(function() {
+            alert_style(this, $(this).attr('class').split(/\s/)[0]);
             $('a', this).addClass('btn btn-primary');
         });
 
@@ -1022,10 +1022,6 @@ function rcube_elastic_ui()
         $(p.object).attr('role', 'alert');
         $('a', p.object).addClass('alert-link');
 /*
-        var siblings = $(p.object).siblings('div');
-        if (siblings.length)
-            $(p.object).insertBefore(siblings.first());
-
         // show a popup dialog on errors
         if (p.type == 'error' && rcmail.env.task != 'login') {
             // hide original message object, we don't want both
@@ -1046,7 +1042,8 @@ function rcube_elastic_ui()
                 notice: 'alert-info',
                 error: 'alert-danger',
                 warning: 'alert-warning',
-                loading: 'alert-info loading'
+                loading: 'alert-info loading',
+                vcardattachment: 'alert-info' /* vcard_attachments plugin */
             };
 
         if (cl = map[type]) {