diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index bc4770ee5..7c7c58cdd 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -135,6 +135,12 @@ html.ms .propform {
 }
 
 
+.popup form.propform {
+    padding: .5rem;
+    overflow-x: hidden;
+}
+
+
 /* Some common icons for "iconized inputs" */
 .input-group-addon.icon {
     text-decoration: none;
diff --git a/skins/elastic/styles/widgets/lists.less b/skins/elastic/styles/widgets/lists.less
index d87b5b72b..24e70c33e 100644
--- a/skins/elastic/styles/widgets/lists.less
+++ b/skins/elastic/styles/widgets/lists.less
@@ -48,13 +48,13 @@
     }
 
     td.selection {
-        padding: 0 1em;
-        width: 3em;
+        padding: 0 0 0 .5em;
+        width: 2em;
         text-align: center;
-    }
 
-    td.selection > input {
-        vertical-align: middle;
+        & > input {
+            vertical-align: middle;
+        }
     }
 
     li.droptarget > a,
@@ -128,6 +128,11 @@ html.touch {
     li input[type=checkbox] {
         height: @listing-touch-line-height;
     }
+
+    td.selection {
+        padding: 0;
+        width: 3em;
+    }
 }
 
 /* icons */
@@ -468,7 +473,8 @@ table.fixedcopy {
     }
 
     td.threads {
-        padding-left: 0;
+        padding: 0 0 0 .25rem;
+        width: 1.5em;
     }
 
     td.flags {
@@ -597,6 +603,10 @@ html.touch {
                 right: 1em;
             }
         }
+        td.threads {
+            padding: 0;
+            width: 2em;
+        }
     }
 }
 
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 60cd71bdf..ba9140548 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -496,7 +496,15 @@ function rcube_elastic_ui()
                 $('div:last', this).addClass('col-sm-8');
             });
             $('.label', this).addClass('col-form-label');
-            $('input,select').addClass('form-control');
+            $('input,select,textarea', this).addClass('form-control');
+        });
+
+        // Other forms, e.g. Insert response
+        $('.propform > .prop.block:not(.row)', context).each(function() {
+            $(this).addClass('form-group row').each(function() {
+              $('label', this).addClass('col-form-label').wrap($('<div class="col-sm-4 col-form-label">'));
+              $('input,select,textarea', this).addClass('form-control').wrap($('<div class="col-sm-8">'));
+            });
         });
 
         // Testing Bootstrap Tabs on contact info/edit page