diff --git a/program/js/app.js b/program/js/app.js
index 21ab0e771..a3b4fd04c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -4859,9 +4859,9 @@ function rcube_webmail()
     // show dialog to enter a name and to modify the text to be saved
     var buttons = {}, text = this.editor.get_content({selection: true, format: 'text', nosig: true}),
       html = '<form class="propform">' +
-      '<div class="prop block"><label>' + this.get_label('responsename') + '</label>' +
+      '<div class="prop block"><label for="ffresponsename">' + this.get_label('responsename') + '</label>' +
       '<input type="text" name="name" id="ffresponsename" size="40" /></div>' +
-      '<div class="prop block"><label>' + this.get_label('responsetext') + '</label>' +
+      '<div class="prop block"><label for="ffresponsetext">' + this.get_label('responsetext') + '</label>' +
       '<textarea name="text" id="ffresponsetext" cols="40" rows="8"></textarea></div>' +
       '</form>';
 
diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index 874385b8b..8b954d9a9 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -276,7 +276,7 @@ input.smart-upload {
                 }
             }
 
-            .form-group.row {
+            :not(tr).form-group.row {
                 .col-form-label {
                     width: 33%;
                 }
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index c3b1b78fa..0bb76bcdc 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -787,9 +787,9 @@ function rcube_elastic_ui()
         // 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).wrap($('<div class="col-sm-8">'));
-              $(supported_controls, this).addClass('form-control');
+                $('label', this).addClass('col-form-label').wrap($('<div class="col-sm-4">'));
+                $('input,select,textarea', this).wrap($('<div class="col-sm-8">'));
+                $(supported_controls, this).addClass('form-control');
             });
         });