diff --git a/program/js/app.js b/program/js/app.js
index c6d7b8098..fa319bd48 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -4311,19 +4311,14 @@ function rcube_webmail()
       if (state > 1) {
         // build content of the dialog
         $.each({cur: 1, sub: 2, all: 4}, function(i, v) {
-          var label = $('<label>').attr('style', 'display:block; line-height:22px'),
-            text = $('<span>').text(ref.get_label('folders-' + i)),
-            input = $('<input>').attr({type: 'radio', value: i, name: 'mode'});
+          var id = 'readallmode' + i,
+            label = $('<label>').attr('for', id).text(ref.get_label('folders-' + i)),
+            input = $('<input>').attr({type: 'radio', value: i, name: 'mode', id: id, disabled: !(state & v)});
 
-          if (!(state & v)) {
-            label.attr('class', 'disabled');
-            input.attr('disabled', true);
-          }
-
-          nodes.push(label.append(input).append(text));
+          nodes.push($('<li>').append([input, label]));
         });
 
-        content = $('<div>').append(nodes);
+        content = $('<ul class="proplist">').append(nodes);
         $('input:not([disabled]):first', content).attr('checked', true);
 
         this.simple_dialog(content, this.get_label('markallread'),
diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index 297120b92..a3ebc1c2a 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -664,6 +664,10 @@ html.ms .propform {
 
         input[type=radio] {
             margin-right: .5em;
+
+            &:disabled + label {
+                opacity: .5;
+            }
         }
 
         label:not(.input-group-text) {