diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
index 9bccfcacf..cafd281d5 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -457,7 +457,7 @@ class rcube_sieve_engine
             else if ($action == 'ruleadd') {
                 $rid = rcube_utils::get_input_value('_rid', rcube_utils::INPUT_POST);
                 $id = $this->genid();
-                $content = $this->rule_div($fid, $id, false);
+                $content = $this->rule_div($fid, $id, false, $_SESSION['managesieve-compact-form']);
 
                 $this->rc->output->command('managesieve_rulefill', $content, $id, $rid);
             }
@@ -1435,8 +1435,11 @@ class rcube_sieve_engine
         if (!$attrib['id'])
             $attrib['id'] = 'rcmfilterform';
 
-        $fid = rcube_utils::get_input_value('_fid', rcube_utils::INPUT_GPC);
-        $scr = isset($this->form) ? $this->form : $this->script[$fid];
+        $fid     = rcube_utils::get_input_value('_fid', rcube_utils::INPUT_GPC);
+        $scr     = isset($this->form) ? $this->form : $this->script[$fid];
+        $compact = !empty($attrib['compact-form']);
+
+        $_SESSION['managesieve-compact-form'] = true;
 
         // do not allow creation of new rules
         if ($fid == null && in_array('new_rule', $this->disabled_actions)) {
@@ -1449,8 +1452,7 @@ class rcube_sieve_engine
         $hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] || $_GET['_framed'] ? 1 : 0)));
         $hiddenfields->add(array('name' => '_fid', 'value' => $fid));
 
-        $out = '<form name="filterform" action="./" method="post">'."\n";
-        $out .= $hiddenfields->show();
+        $out = $hiddenfields->show();
 
         // 'any' flag
         if ((!isset($this->form) && empty($scr['tests']) && !empty($scr))
@@ -1460,72 +1462,105 @@ class rcube_sieve_engine
         }
 
         // filter name input
-        $field_id = '_name';
-        $input_name = new html_inputfield(array('name' => '_name', 'id' => $field_id, 'size' => 30,
-            'class' => ($this->errors['name'] ? 'error' : '')));
+        $input_name = new html_inputfield(array(
+                'name'  => '_name',
+                'id'    => '_name',
+                'size'  => 30,
+                'class' => ($this->errors['name'] ? ' error' : '')
+        ));
 
         if ($this->errors['name'])
-            $this->add_tip($field_id, $this->errors['name'], true);
+            $this->add_tip('_name', $this->errors['name'], true);
 
-        if (isset($scr))
-            $input_name = $input_name->show($scr['name']);
-        else
-            $input_name = $input_name->show();
+        $input_name = $input_name->show(isset($scr) ? $scr['name'] : '');
 
-        $out .= sprintf("\n<label for=\"%s\"><b>%s:</b></label> %s\n",
-            $field_id, rcube::Q($this->plugin->gettext('filtername')), $input_name);
+        $out .= sprintf("\n" . '<div class="form-group row">'
+            . '<label for="_name" class="col-sm-4 col-form-label">%s</label>'
+            . '<div class="col-sm-8">%s</div></div>',
+            rcube::Q($this->plugin->gettext('filtername')), $input_name);
 
         // filter set selector
         if ($this->rc->task == 'mail') {
-            $out .= sprintf("\n&nbsp;<label for=\"%s\"><b>%s:</b></label> %s\n",
+            $out .= sprintf("\n" . '<div class="form-group row">'
+                . '<label for="%s" class="col-sm-4 col-form-label">%s</label>'
+                . '<div class="col-sm-8">%s</div></div>',
                 $field_id, rcube::Q($this->plugin->gettext('filterset')),
                 $this->filtersets_list(array('id' => 'sievescriptname'), true));
         }
+        else if ($compact) {
+            $out .= sprintf("\n" . '<div class="form-group row form-check">'
+                . '<label for="disabled" class="col-sm-4 col-form-label">%s</label>'
+                . '<div class="col-sm-8 form-check"><input type="checkbox" id="disabled" name="_disabled" value="1" /></div></div>',
+                rcube::Q($this->plugin->gettext('filterdisabled')));
+        }
 
-        $out .= '<br><br><fieldset><legend>' . rcube::Q($this->plugin->gettext('messagesrules')) . "</legend>\n";
+        if ($compact) {
+            $select = new html_select(array('name' => '_join', 'id' => '_join' . $id,
+                'onchange' => 'rule_join_radio(this.value)'));
 
-        // any, allof, anyof radio buttons
-        $field_id = '_allof';
-        $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'allof',
-            'onclick' => 'rule_join_radio(\'allof\')', 'class' => 'radio'));
+            foreach (array('allof', 'anyof', 'any') as $val) {
+                $select->add($this->plugin->gettext('filter' . $val), $val);
+            }
 
-        if (isset($scr) && !$any)
-            $input_join = $input_join->show($scr['join'] ? 'allof' : '');
-        else
-            $input_join = $input_join->show();
+            $join = $any ? 'any' : 'allof';
+            if (isset($scr) && !$any) {
+                 $join = $scr['join'] ? 'allof' : 'anyof';
+            }
 
-        $out .= $input_join . html::label($field_id, rcube::Q($this->plugin->gettext('filterallof')));
+            $out .= sprintf("\n" . '<div class="form-group row">'
+                . '<label for="_join" class="col-sm-4 col-form-label">%s</label>'
+                . '<div class="col-sm-8">%s</div></div>',
+                rcube::Q($this->plugin->gettext('scope')), $select->show($join));
 
-        $field_id = '_anyof';
-        $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'anyof',
-            'onclick' => 'rule_join_radio(\'anyof\')', 'class' => 'radio'));
+            $out .= '<div id="rules"'.($any ? ' style="display: none"' : '').'>';
+            $out .= "\n<fieldset><legend>" . rcube::Q($this->plugin->gettext('rules')) . "</legend>\n";
+        }
+        else {
+            $out .= '<br><fieldset><legend>' . rcube::Q($this->plugin->gettext('messagesrules')) . "</legend>\n";
 
-        if (isset($scr) && !$any)
-            $input_join = $input_join->show($scr['join'] ? '' : 'anyof');
-        else
-            $input_join = $input_join->show('anyof'); // default
+            // any, allof, anyof radio buttons
+            $field_id = '_allof';
+            $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'allof',
+                'onclick' => 'rule_join_radio(\'allof\')', 'class' => 'radio'));
 
-        $out .= $input_join . html::label($field_id, rcube::Q($this->plugin->gettext('filteranyof')));
+            if (isset($scr) && !$any)
+                $input_join = $input_join->show($scr['join'] ? 'allof' : '');
+            else
+                $input_join = $input_join->show();
 
-        $field_id = '_any';
-        $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'any',
-            'onclick' => 'rule_join_radio(\'any\')', 'class' => 'radio'));
+            $out .= $input_join . html::label($field_id, rcube::Q($this->plugin->gettext('filterallof')));
 
-        $input_join = $input_join->show($any ? 'any' : '');
+            $field_id = '_anyof';
+            $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'anyof',
+                'onclick' => 'rule_join_radio(\'anyof\')', 'class' => 'radio'));
 
-        $out .= $input_join . html::label($field_id, rcube::Q($this->plugin->gettext('filterany')));
+            if (isset($scr) && !$any)
+                $input_join = $input_join->show($scr['join'] ? '' : 'anyof');
+            else
+                $input_join = $input_join->show('anyof'); // default
 
-        $rows_num = !empty($scr['tests']) ? count($scr['tests']) : 1;
+            $out .= $input_join . html::label($field_id, rcube::Q($this->plugin->gettext('filteranyof')));
 
-        $out .= '<div id="rules"'.($any ? ' style="display: none"' : '').'>';
-        for ($x=0; $x<$rows_num; $x++)
-            $out .= $this->rule_div($fid, $x);
-        $out .= "</div>\n";
+            $field_id = '_any';
+            $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'any',
+                'onclick' => 'rule_join_radio(\'any\')', 'class' => 'radio'));
 
-        $out .= "</fieldset>\n";
+            $input_join = $input_join->show($any ? 'any' : '');
+
+            $out .= $input_join . html::label($field_id, rcube::Q($this->plugin->gettext('filterany')));
+            $out .= '<div id="rules"'.($any ? ' style="display: none"' : '').'>';
+        }
+
+        $rows_num = !empty($scr['tests']) ? count($scr['tests']) : 1;
+        for ($x=0; $x<$rows_num; $x++) {
+            $out .= $this->rule_div($fid, $x, true, $compact);
+        }
+
+        $out .= $compact ? "</fieldset>\n</div>\n" : "</div>\n</fieldset>\n";
 
         // actions
-        $out .= '<fieldset><legend>' . rcube::Q($this->plugin->gettext('messagesactions')) . "</legend>\n";
+        $label = $this->plugin->gettext($compact ? 'actions' : 'messagesactions');
+        $out .= '<fieldset><legend>' . rcube::Q($label) . "</legend>\n";
 
         $rows_num = isset($scr) ? count($scr['actions']) : 1;
 
@@ -1547,10 +1582,14 @@ class rcube_sieve_engine
         );
         $this->rc->output->add_gui_object('sieveform', 'filterform');
 
-        return $out;
+        $attrib['name']   = 'filterform';
+        $attrib['action'] = './';
+        $attrib['method'] = 'post';
+
+        return html::tag('form', $attrib, $out, array('name', 'action', 'method', 'class'));
     }
 
-    function rule_div($fid, $id, $div=true)
+    function rule_div($fid, $id, $div = true, $compact = false)
     {
         $rule     = isset($this->form) ? $this->form['tests'][$id] : $this->script[$fid]['tests'][$id];
         $rows_num = isset($this->form) ? count($this->form['tests']) : count($this->script[$fid]['tests']);
@@ -1607,6 +1646,7 @@ class rcube_sieve_engine
             }
         }
 
+        $tout = '<div class="flexbox">';
         $aout = $select_header->show($test);
 
         // custom headers input
@@ -1629,11 +1669,11 @@ class rcube_sieve_engine
             }
         }
 
-        // custom variable input
-        $tout = $this->list_input($id, 'custom_header', $custom, isset($custom),
+        // custom header and variable inputs
+        $aout .= $this->list_input($id, 'custom_header', $custom, isset($custom),
             $this->error_class($id, 'test', 'header', 'custom_header'), 15) . "\n";
 
-        $tout .= $this->list_input($id, 'custom_var', $customv, isset($customv),
+        $aout .= $this->list_input($id, 'custom_var', $customv, isset($customv),
             $this->error_class($id, 'test', 'header', 'custom_var'), 15) . "\n";
 
         // matching type select (operator)
@@ -1702,7 +1742,7 @@ class rcube_sieve_engine
                 $select_dp->add(rcube::Q($this->plugin->gettext($part)), $part);
             }
 
-            $tout .= $select_dp->show($rule['test'] == 'currentdate' || $rule['test'] == 'date' ? $rule['part'] : '');
+            $aout .= $select_dp->show($rule['test'] == 'currentdate' || $rule['test'] == 'date' ? $rule['part'] : '');
         }
 
         // message test select (e.g. duplicate)
@@ -1723,11 +1763,16 @@ class rcube_sieve_engine
             $rule['test'] != 'size' && $rule['test'] != 'exists' && $rule['test'] != 'duplicate',
             $this->error_class($id, 'test', 'target', 'rule_target')) . "\n";
 
-        $select_size_op = new html_select(array('name' => "_rule_size_op[]", 'id' => 'rule_size_op'.$id));
+        $select_size_op = new html_select(array('name' => "_rule_size_op[]", 'id' => 'rule_size_op'.$id, 'class' => 'input-group-addon'));
         $select_size_op->add(rcube::Q($this->plugin->gettext('filterover')), 'over');
         $select_size_op->add(rcube::Q($this->plugin->gettext('filterunder')), 'under');
 
-        $tout .= '<div id="rule_size' .$id. '" style="display:' . ($rule['test']=='size' ? 'inline' : 'none') .'">';
+        $select_size_item = new html_select(array('name' => "_rule_size_item[]", 'id' => 'rule_size_item'.$id, 'class' => 'input-group-addon'));
+        foreach (array('', 'K', 'M', 'G') as $unit) {
+            $select_size_item->add($this->plugin->gettext($unit . 'B'), $unit);
+        }
+
+        $tout .= '<div id="rule_size' .$id. '" class="input-group" style="display:' . ($rule['test']=='size' ? 'inline' : 'none') .'">';
         $tout .= $select_size_op->show($rule['test']=='size' ? $rule['type'] : '');
         $tout .= html::tag('input', array(
                 'type'  => 'text',
@@ -1737,15 +1782,8 @@ class rcube_sieve_engine
                 'size'  => 10,
                 'class' => $this->error_class($id, 'test', 'sizetarget', 'rule_size_i'),
             ));
-        foreach (array('', 'K', 'M', 'G') as $unit) {
-            $tout .= html::label(null, html::tag('input', array(
-                    'type'    => 'radio',
-                    'name'    => '_rule_size_item['.$id.']',
-                    'value'   => $unit,
-                    'checked' => $sizeitem == $unit,
-                    'class'   => 'radio',
-                )) . $this->rc->gettext($unit . 'B'));
-        }
+        $tout .= $select_size_item->show($sizeitem);
+        $tout .= '</div>';
         $tout .= '</div>';
 
         // Advanced modifiers (address, envelope)
@@ -1767,10 +1805,10 @@ class rcube_sieve_engine
         }
 
         $need_mod = !in_array($rule['test'], array('size', 'body', 'date', 'currentdate', 'duplicate', 'string'));
-        $mout = '<div id="rule_mod' .$id. '" class="adv"' . (!$need_mod ? ' style="display:none"' : '') . '>';
-        $mout .= ' <span class="label">' . rcube::Q($this->plugin->gettext('modifier')) . ' </span>';
+        $mout = '<div id="rule_mod' .$id. '" class="adv input-group"' . (!$need_mod ? ' style="display:none"' : '') . '>';
+        $mout .= ' <span class="label input-group-addon">' . rcube::Q($this->plugin->gettext('modifier')) . ' </span>';
         $mout .= $select_mod->show($rule['test']);
-        $mout .= ' <span id="rule_mod_type' . $id . '"';
+        $mout .= ' <span id="rule_mod_type' . $id . '" class="input-group-addon"';
         $mout .= ' style="display:' . (in_array($rule['test'], array('address', 'envelope')) ? 'inline' : 'none') .'">';
         $mout .= rcube::Q($this->plugin->gettext('modtype')) . ' ';
         $mout .= $select_type->show($rule['part']);
@@ -1784,8 +1822,8 @@ class rcube_sieve_engine
         $select_mod->add(rcube::Q($this->plugin->gettext('undecoded')), 'raw');
         $select_mod->add(rcube::Q($this->plugin->gettext('contenttype')), 'content');
 
-        $mout .= '<div id="rule_trans' .$id. '" class="adv"' . ($rule['test'] != 'body' ? ' style="display:none"' : '') . '>';
-        $mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('modifier')) . '</span>';
+        $mout .= '<div id="rule_trans' .$id. '" class="adv input-group"' . ($rule['test'] != 'body' ? ' style="display:none"' : '') . '>';
+        $mout .= '<span class="label input-group-addon">' . rcube::Q($this->plugin->gettext('modifier')) . '</span>';
         $mout .= $select_mod->show($rule['part']);
         $mout .= html::tag('input', array(
                 'type'  => 'text',
@@ -1809,15 +1847,15 @@ class rcube_sieve_engine
 
         // Comparators
         $need_comp = $rule['test'] != 'size' && $rule['test'] != 'duplicate';
-        $mout .= '<div id="rule_comp' .$id. '" class="adv"' . (!$need_comp ? ' style="display:none"' : '') . '>';
-        $mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('comparator')) . '</span>';
+        $mout .= '<div id="rule_comp' .$id. '" class="adv input-group"' . (!$need_comp ? ' style="display:none"' : '') . '>';
+        $mout .= '<span class="label input-group-addon">' . rcube::Q($this->plugin->gettext('comparator')) . '</span>';
         $mout .= $select_comp->show($rule['comparator']);
         $mout .= '</div>';
 
         // Date header
         if (in_array('date', $this->exts)) {
-            $mout .= '<div id="rule_date_header_div' .$id. '" class="adv"'. ($rule['test'] != 'date' ? ' style="display:none"' : '') .'>';
-            $mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('dateheader')) . '</span>';
+            $mout .= '<div id="rule_date_header_div' .$id. '" class="adv input-group"'. ($rule['test'] != 'date' ? ' style="display:none"' : '') .'>';
+            $mout .= '<span class="label input-group-addon">' . rcube::Q($this->plugin->gettext('dateheader')) . '</span>';
             $mout .= html::tag('input', array(
                     'type'  => 'text',
                     'name'  => '_rule_date_header[]',
@@ -1832,8 +1870,8 @@ class rcube_sieve_engine
         // Index
         if (in_array('index', $this->exts)) {
             $need_index = in_array($rule['test'], array('header', ', address', 'date'));
-            $mout .= '<div id="rule_index_div' .$id. '" class="adv"'. (!$need_index ? ' style="display:none"' : '') .'>';
-            $mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('index')) . '</span>';
+            $mout .= '<div id="rule_index_div' .$id. '" class="adv input-group"'. (!$need_index ? ' style="display:none"' : '') .'>';
+            $mout .= '<span class="label input-group-addon">' . rcube::Q($this->plugin->gettext('index')) . '</span>';
             $mout .= html::tag('input', array(
                     'type'  => 'text',
                     'name'  => '_rule_index[]',
@@ -1842,14 +1880,14 @@ class rcube_sieve_engine
                     'size'  => 3,
                     'class' => $this->error_class($id, 'test', 'index', 'rule_index'),
                 ));
-            $mout .= '&nbsp;' . html::tag('input', array(
-                    'type'    => 'checkbox',
-                    'name'    => '_rule_index_last[]',
-                    'id'      => 'rule_index_last' . $id,
-                    'value'   => 1,
-                    'checked' => !empty($rule['last']),
-                ))
-                . html::label('rule_index_last' . $id, rcube::Q($this->plugin->gettext('indexlast')));
+            $mout .= html::label(array('class' => 'input-group-addon'),
+                    html::tag('input', array(
+                        'type'    => 'checkbox',
+                        'name'    => '_rule_index_last[]',
+                        'id'      => 'rule_index_last' . $id,
+                        'value'   => 1,
+                        'checked' => !empty($rule['last']),
+                    )) . rcube::Q($this->plugin->gettext('indexlast')));
             $mout .= '</div>';
         }
 
@@ -1859,7 +1897,8 @@ class rcube_sieve_engine
             $mout .= '<div id="rule_duplicate_div' .$id. '" class="adv"'. (!$need_duplicate ? ' style="display:none"' : '') .'>';
 
             foreach (array('handle', 'header', 'uniqueid') as $unit) {
-                $mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('duplicate.handle')) . '</span>';
+                $mout .= '<div class="input-group">';
+                $mout .= '<span class="label input-group-addon">' . rcube::Q($this->plugin->gettext('duplicate.' . $unit)) . '</span>';
                 $mout .= html::tag('input', array(
                         'type'  => 'text',
                         'name'  => '_rule_duplicate_' . $unit . '[]',
@@ -1868,10 +1907,11 @@ class rcube_sieve_engine
                         'size'  => 30,
                         'class' => $this->error_class($id, 'test', 'duplicate_' . $unit, 'rule_duplicate_' . $unit),
                     ));
-                $mout .= '<br>';
+                $mout .= '</div>';
             }
 
-            $mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('duplicate.seconds')) . '</span>';
+            $mout .= '<div class="input-group">';
+            $mout .= '<span class="label input-group-addon">' . rcube::Q($this->plugin->gettext('duplicate.seconds')) . '</span>';
             $mout .= html::tag('input', array(
                     'type'  => 'text',
                     'name'  => '_rule_duplicate_seconds[]',
@@ -1880,38 +1920,49 @@ class rcube_sieve_engine
                     'size'  => 6,
                     'class' => $this->error_class($id, 'test', 'duplicate_seconds', 'rule_duplicate_seconds'),
                 ));
-            $mout .= '&nbsp;' . html::tag('input', array(
+            $mout .= html::label(array('class' => 'input-group-addon'),
+                html::tag('input', array(
                     'type'    => 'checkbox',
                     'name'    => '_rule_duplicate_last[' . $id . ']',
                     'id'      => 'rule_duplicate_last' . $id,
                     'value'   => 1,
                     'checked' => !empty($rule['last']),
-                ));
-            $mout .= html::label('rule_duplicate_last' . $id, rcube::Q($this->plugin->gettext('duplicate.last')));
+                )) . rcube::Q($this->plugin->gettext('duplicate.last')));
+            $mout .= '</div>';
             $mout .= '</div>';
         }
 
+        $add_title = rcube::Q($this->plugin->gettext('add'));
+        $del_title = rcube::Q($this->plugin->gettext('del'));
+        $adv_title = rcube::Q($this->plugin->gettext('advancedopts'));
+
         // Build output table
         $out = $div ? '<div class="rulerow" id="rulerow' .$id .'">'."\n" : '';
-        $out .= '<table><tr>';
-        $out .= '<td class="advbutton">';
-        $out .= '<a href="#" id="ruleadv' . $id .'" title="'. rcube::Q($this->plugin->gettext('advancedopts')). '"
-            onclick="rule_adv_switch(' . $id .', this)" class="show">&nbsp;&nbsp;</a>';
-        $out .= '</td>';
-        $out .= '<td class="rowactions">' . $aout . '</td>';
+        $out .= '<table class="compact-table"><tr>';
+
+        if (!$compact) {
+            $out .= '<td class="advbutton">';
+            $out .= sprintf('<a href="#" id="ruleadv%s" title="%s" onclick="rule_adv_switch(%s, this)" class="show">'
+                . '<span class="inner">%s</span></a>', $id, $adv_title, $id, $adv_title);
+            $out .= '</td>';
+        }
+
+        $out .= '<td class="rowactions"><div class="flexbox">' . $aout . '</div></td>';
         $out .= '<td class="rowtargets">' . $tout . "\n";
-        $out .= '<div id="rule_advanced' .$id. '" style="display:none">' . $mout . '</div>';
+        $out .= '<div id="rule_advanced' .$id. '" style="display:none" class="advanced">' . $mout . '</div>';
         $out .= '</td>';
-
-        // add/del buttons
         $out .= '<td class="rowbuttons">';
-        $out .= '<a href="#" id="ruleadd' . $id .'" title="'. rcube::Q($this->plugin->gettext('add')). '"
-            onclick="rcmail.managesieve_ruleadd(' . $id .')" class="button add"></a>';
-        $out .= '<a href="#" id="ruledel' . $id .'" title="'. rcube::Q($this->plugin->gettext('del')). '"
-            onclick="rcmail.managesieve_ruledel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
+        if ($compact) {
+            $out .= sprintf('<a href="#" id="ruleadv%s" title="%s" onclick="rule_adv_switch(%s, this)" class="advanced show">'
+                . '<span class="inner">%s</span></a>', $id, $adv_title, $id, $adv_title);
+        }
+        $out .= sprintf('<a href="#" id="ruleadd%s" title="%s" onclick="rcmail.managesieve_ruleadd(\'%s\')" class="button create add">'
+            . '<span class="inner">%s</span></a>', $id, $add_title, $id, $add_title);
+        $out .= sprintf('<a href="#" id="ruledel%s" title="%s" onclick="rcmail.managesieve_ruledel(\'%s\')" class="button delete del%s">'
+            . '<span class="inner">%s</span></a>', $id, $del_title, $id, ($rows_num < 2 ? ' disabled' : ''), $del_title);
         $out .= '</td>';
-        $out .= '</tr></table>';
 
+        $out .= '</tr></table>';
         $out .= $div ? "</div>\n" : '';
 
         return $out;
@@ -1961,7 +2012,7 @@ class rcube_sieve_engine
 
         $out = $div ? '<div class="actionrow" id="actionrow' .$id .'">'."\n" : '';
 
-        $out .= '<table><tr><td class="rowactions">';
+        $out .= '<table class="compact-table"><tr><td class="rowactions">';
 
         // action select
         $select_action = new html_select(array('name' => "_action_type[$id]", 'id' => 'action_type'.$id,
@@ -2093,8 +2144,8 @@ class rcube_sieve_engine
                     $this->error_class($id, 'action', 'addresses', 'action_addresses'), 30)
             . html::a(array('href' => '#', 'onclick' => rcmail_output::JS_OBJECT_NAME . ".managesieve_vacation_addresses($id)"),
                 rcube::Q($this->plugin->gettext('filladdresses')));
-        $out .= '<br><span class="label">' . rcube::Q($this->plugin->gettext($vsec ? 'vacationinterval' : 'vacationdays')) . '</span><br>';
-        $out .= html::tag('input', array(
+        $out .= '<br><span class="label">' . rcube::Q($this->plugin->gettext('vacationinterval')) . '</span><br>';
+        $out .= '<div class="input-group">' . html::tag('input', array(
                 'type'  => 'text',
                 'name'  => '_action_interval[' . $id . ']',
                 'id'    => 'action_interval' . $id,
@@ -2103,18 +2154,15 @@ class rcube_sieve_engine
                 'class' => $this->error_class($id, 'action', 'interval', 'action_interval'),
             ));
         if ($vsec) {
-            foreach (array('days', 'seconds') as $unit) {
-                $out .= '&nbsp;' . html::label(null, html::tag('input', array(
-                        'type'    => 'radio',
-                        'name'    => '_action_interval_type[' . $id . ']',
-                        'value'   => $unit,
-                        'checked' => ($unit == 'seconds' && isset($action['seconds'])
-                                        || $unit == 'deys' && !isset($action['seconds'])),
-                        'class'   => 'radio',
-                )) . $this->plugin->gettext($unit));
-            }
+            $interval_select = new html_select(array('name' => '_action_interval_type[' . $id . ']', 'class' => 'input-group-addon'));
+            $interval_select->add($this->plugin->gettext('days'), 'days');
+            $interval_select->add($this->plugin->gettext('seconds'), 'seconds');
+            $out .= $interval_select->show(isset($action['seconds']) ? 'seconds' : 'days');
         }
-        $out .= '</div>';
+        else {
+            $out .= html::span('input-group-addon', $this->plugin->gettext('days'));
+        }
+        $out .= '</div></div>';
 
         // flags
         $flags = array(
@@ -2197,7 +2245,7 @@ class rcube_sieve_engine
         $select_method = new html_select(array(
             'name'  => "_action_notifymethod[$id]",
             'id'    => "_action_notifymethod$id",
-            'class' => $this->error_class($id, 'action', 'method', 'action_notifymethod'),
+            'class' => 'input-group-addon ' . $this->error_class($id, 'action', 'method', 'action_notifymethod'),
         ));
         foreach ($notify_methods as $m_n) {
             $select_method->add(rcube::Q($this->rc->text_exists('managesieve.notifymethod'.$m_n) ? $this->plugin->gettext('managesieve.notifymethod'.$m_n) : $m_n), $m_n);
@@ -2215,6 +2263,7 @@ class rcube_sieve_engine
         // @TODO: nice UI for mailto: (other methods too) URI parameters
         $out .= '<div id="action_notify' .$id.'" style="display:' .($action['type'] == 'notify' ? 'inline' : 'none') .'">';
         $out .= '<span class="label">' .rcube::Q($this->plugin->gettext('notifytarget')) . '</span><br>';
+        $out .= '<div class="input-group">';
         $out .= $select_method->show($method);
         $out .= html::tag('input', array(
                 'type'  => 'text',
@@ -2224,6 +2273,7 @@ class rcube_sieve_engine
                 'size'  => 25,
                 'class' => $this->error_class($id, 'action', 'target', 'action_notifytarget'),
             ));
+        $out .= '</div>';
         $out .= '<br><span class="label">'. rcube::Q($this->plugin->gettext('notifymessage')) .'</span><br>';
         $out .= html::tag('textarea', array(
                 'name'  => '_action_notifymessage[' . $id . ']',
@@ -2273,11 +2323,13 @@ class rcube_sieve_engine
         $out .= '</td>';
 
         // add/del buttons
+        $add_label = rcube::Q($this->plugin->gettext('add'));
+        $del_label = rcube::Q($this->plugin->gettext('del'));
         $out .= '<td class="rowbuttons">';
-        $out .= '<a href="#" id="actionadd' . $id .'" title="'. rcube::Q($this->plugin->gettext('add')). '"
-            onclick="rcmail.managesieve_actionadd(' . $id .')" class="button add"></a>';
-        $out .= '<a href="#" id="actiondel' . $id .'" title="'. rcube::Q($this->plugin->gettext('del')). '"
-            onclick="rcmail.managesieve_actiondel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
+        $out .= sprintf('<a href="#" id="actionadd%s" title="%s" onclick="rcmail.managesieve_actionadd(%s)" class="button create add">'
+            . '<span class="inner">%s</span></a>', $id, $add_label, $id, $add_label);
+        $out .= sprintf('<a href="#" id="actiondel%s" title="%s" onclick="rcmail.managesieve_actiondel(%s)" class="button delete del%s">'
+            . '<span class="inner">%s</span></a>', $id, $del_label, $id, ($rows_num < 2 ? ' disabled' : ''), $del_label);
         $out .= '</td>';
 
         $out .= '</tr></table>';
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
index 76a286697..be75fa01f 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
@@ -392,10 +392,10 @@ class rcube_sieve_vacation extends rcube_sieve_engine
             $interval_select = new html_select(array('name' => 'vacation_interval_type'));
             $interval_select->add($this->plugin->gettext('days'), 'days');
             $interval_select->add($this->plugin->gettext('seconds'), 'seconds');
-            $interval_txt .= '&nbsp;' . $interval_select->show(isset($this->vacation['seconds']) ? 'seconds' : 'days');
+            $interval_txt .= $interval_select->show(isset($this->vacation['seconds']) ? 'seconds' : 'days');
         }
         else {
-            $interval_txt .= '&nbsp;' . $this->plugin->gettext('days');
+            $interval_txt .= html::span('input-group-addon', $this->plugin->gettext('days'));
         }
 
         if ($date_extension || $regex_extension) {
@@ -495,7 +495,7 @@ class rcube_sieve_vacation extends rcube_sieve_engine
         $table->add('title', html::label('vacation_addresses', $this->plugin->gettext('vacation.addresses')));
         $table->add(null, $addresses . $addresses_link->show($this->plugin->gettext('filladdresses')));
         $table->add('title', html::label('vacation_interval', $this->plugin->gettext('vacation.interval')));
-        $table->add(null, $interval_txt);
+        $table->add('input-group', $interval_txt);
 
         if ($after) {
             $table->add('title', html::label('vacation_after', $this->plugin->gettext('vacation.after')));
diff --git a/plugins/managesieve/localization/en_US.inc b/plugins/managesieve/localization/en_US.inc
index 978a0c024..d8da8ac49 100644
--- a/plugins/managesieve/localization/en_US.inc
+++ b/plugins/managesieve/localization/en_US.inc
@@ -23,6 +23,9 @@ $labels['filtername'] = 'Filter name';
 $labels['newfilter'] = 'New filter';
 $labels['filteradd'] = 'Add filter';
 $labels['filterdel'] = 'Delete filter';
+$labels['rules'] = 'Rules';
+$labels['actions'] = 'Actions';
+$labels['scope'] = 'Scope';
 $labels['moveup'] = 'Move up';
 $labels['movedown'] = 'Move down';
 $labels['filterallof'] = 'matching all of the following rules';
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index c0e78a609..6c1f22fb1 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -515,14 +515,11 @@ rcube_webmail.prototype.managesieve_rulefill = function(content, id, after)
 {
   if (content != '') {
     // create new element
-    var div = document.getElementById('rules'),
-      row = document.createElement('div');
+    var div = $('#rules')[0],
+      row = $('<div>').attr({'class': 'rulerow', id: 'rulerow'+id})
+        .html(content);
 
     this.managesieve_insertrow(div, row, after);
-    // fill row after inserting (for IE)
-    row.setAttribute('id', 'rulerow'+id);
-    row.className = 'rulerow';
-    row.innerHTML = content;
 
     // initialize smart list inputs
     $('textarea[data-type="list"]', row).each(function() {
@@ -553,14 +550,11 @@ rcube_webmail.prototype.managesieve_actionadd = function(id)
 rcube_webmail.prototype.managesieve_actionfill = function(content, id, after)
 {
   if (content != '') {
-    var div = document.getElementById('actions'),
-      row = document.createElement('div');
+    var div = $('#actions')[0],
+      row = $('<div>').attr({'class': 'actionrow', id: 'actionrow'+id})
+        .html(content);
 
     this.managesieve_insertrow(div, row, after);
-    // fill row after inserting (for IE)
-    row.className = 'actionrow';
-    row.setAttribute('id', 'actionrow'+id);
-    row.innerHTML = content;
 
     // initialize smart list inputs
     $('textarea[data-type="list"]', row).each(function() {
@@ -586,43 +580,24 @@ rcube_webmail.prototype.managesieve_actiondel = function(id)
 // insert rule/action row in specified place on the list
 rcube_webmail.prototype.managesieve_insertrow = function(div, row, after)
 {
-  for (var i=0; i<div.childNodes.length; i++) {
-    if (div.childNodes[i].id == (div.id == 'rules' ? 'rulerow' : 'actionrow')  + after)
-      break;
-  }
+  var node = $('#' + ($(div).attr('id') == 'rules' ? 'rulerow' : 'actionrow')  + after)[0];
 
-  if (div.childNodes[i+1])
-    div.insertBefore(row, div.childNodes[i+1]);
+  if (node)
+    $(row).insertAfter(node);
   else
-    div.appendChild(row);
+    $(div).append(row);
+
+  this.triggerEvent('managesieve.insertrow', {obj: row});
 };
 
 // update Delete buttons status
 rcube_webmail.prototype.managesieve_formbuttons = function(div)
 {
-  var i, button, buttons = [];
-
-  // count and get buttons
-  for (i=0; i<div.childNodes.length; i++) {
-    if (div.id == 'rules' && div.childNodes[i].id) {
-      if (/rulerow/.test(div.childNodes[i].id))
-        buttons.push('ruledel' + div.childNodes[i].id.replace(/rulerow/, ''));
-    }
-    else if (div.childNodes[i].id) {
-      if (/actionrow/.test(div.childNodes[i].id))
-        buttons.push( 'actiondel' + div.childNodes[i].id.replace(/actionrow/, ''));
-    }
-  }
+  var buttons = $('a.delete', div);
 
-  for (i=0; i<buttons.length; i++) {
-    button = document.getElementById(buttons[i]);
-    if (i>0 || buttons.length>1) {
-      $(button).removeClass('disabled');
-    }
-    else {
-      $(button).addClass('disabled');
-    }
-  }
+  buttons.removeClass('disabled');
+  if (buttons.length == 1)
+    buttons.addClass('disabled');
 };
 
 // update vacation addresses field with user identities
@@ -659,22 +634,22 @@ function rule_header_select(id)
   if (h == 'size') {
     if (msg) set.push(msg);
     $.each(set, function() { this.style.display = 'none'; });
-    size.style.display = 'inline';
+    size.style.display = '';
   }
   else if (h == 'message' && msg) {
     $.each(set, function() { this.style.display = 'none'; });
-    msg.style.display = 'inline';
+    msg.style.display = '';
   }
   else {
-    header.style.display = h != '...' ? 'none' : 'inline-block';
-    custstr.style.display = h != 'string' ? 'none' : 'inline-block';
+    header.style.display = h != '...' ? 'none' : '';
+    custstr.style.display = h != 'string' ? 'none' : '';
     size.style.display = 'none';
-    op.style.display = 'inline';
+    op.style.display = '';
     comp.style.display = '';
-    mod.style.display = h == 'body' || h == 'currentdate' || h == 'date' || h == 'string' ? 'none' : 'block';
-    trans.style.display = h == 'body' ? 'block' : 'none';
+    mod.style.display = h == 'body' || h == 'currentdate' || h == 'date' || h == 'string' ? 'none' : '';
+    trans.style.display = h == 'body' ? '' : 'none';
     if (msg)
-      msg.style.display = h == 'message' ? 'block' : 'none';
+      msg.style.display = h == 'message' ? '' : 'none';
   }
 
   if (datepart)
@@ -699,7 +674,7 @@ function rule_op_select(obj, id, header)
   if (!header)
     header = document.getElementById('header' + id).value;
 
-  target.style.display = obj.value.match(/^(exists|notexists)$/) || header.match(/^(size|message)$/) ? 'none' : 'inline-block';
+  target.style.display = obj.value.match(/^(exists|notexists)$/) || header.match(/^(size|message)$/) ? 'none' : '';
 };
 
 function rule_trans_select(id)
@@ -739,14 +714,14 @@ function rule_adv_switch(id, elem)
   var elem = $(elem), enabled = elem.hasClass('hide'), adv = $('#rule_advanced'+id);
 
   if (enabled) {
-    adv.hide();
+    adv.get(0).style.display = 'none';
     elem.removeClass('hide').addClass('show');
   }
   else {
-    adv.show();
+    adv.get(0).style.display = '';
     elem.removeClass('show').addClass('hide');
   }
-}
+};
 
 function action_type_select(id)
 {
@@ -799,6 +774,9 @@ function vacation_action_select()
 // Inititalizes smart list input
 function smart_field_init(field)
 {
+  if (window.UI && UI.smart_field_init)
+    return UI.smart_field_init(field);
+
   var id = field.id + '_list',
     area = $('<span class="listarea"></span>'),
     list = field.value ? field.value.split("\n") : [''];
@@ -884,6 +862,9 @@ function smart_field_row(value, name, idx, size)
 // Reset and fill the smart list input with new data
 function smart_field_reset(field, data)
 {
+  if (window.UI && UI.smart_field_reset)
+    return UI.smart_field_reset(field, data);
+
   var id = field.id + '_list',
     list = data.length ? data : [''];
     area = $('#' + id);
@@ -1097,22 +1078,27 @@ rcube_webmail.prototype.managesieve_create = function(force)
   if (!this.env.sieve_headers || !this.env.sieve_headers.length)
     return;
 
-  var i, html, buttons = {}, dialog = $("#sievefilterform");
+  var i, buttons = {},
+    title = this.get_label('managesieve.newfilter'),
+    dialog = $('<div id="sievefilterform" class="propform"></div>'),
+    props = {minWidth: 600, minHeight: 250, height: 300};
 
-  // create dialog window
-  if (!dialog.length) {
-    dialog = $('<div id="sievefilterform"></div>');
-    $('body').append(dialog);
-  }
 
   // build dialog window content
-  html = '<fieldset><legend>'+this.get_label('managesieve.usedata')+'</legend><ul>';
-  for (i in this.env.sieve_headers)
-    html += '<li><input type="checkbox" name="headers[]" id="sievehdr'+i+'" value="'+i+'" checked="checked" />'
-      +'<label for="sievehdr'+i+'">'+this.env.sieve_headers[i][0]+':</label> '+this.env.sieve_headers[i][1]+'</li>';
-  html += '</ul></fieldset>';
-
-  dialog.html(html);
+  dialog.append($('<fieldset>')
+    .append($('<legend>').text(this.get_label('managesieve.usedata')))
+    .append($('<ul class="proplist">'))
+  );
+
+  $.each(this.env.sieve_headers, function(i, v) {
+    var attr = {type: 'checkbox', name: 'headers[]', id: 'sievehdr' + i, value: i,  checked: true},
+      label = rcmail.env.sieve_headers[i][0] + ': ' + rcmail.env.sieve_headers[i][1];
+
+    $('ul', dialog).append($('<li>')
+      .append($('<input>').attr(attr))
+      .append($('<label>').attr('for', 'sievehdr' + i).text(label))
+    );
+  });
 
   // [Next Step] button action
   buttons[this.get_label('managesieve.nextstep')] = function () {
@@ -1134,41 +1120,32 @@ rcube_webmail.prototype.managesieve_create = function(force)
     });
 
     // load form in the iframe
-    var frame = $('<iframe>').attr({src: url, frameborder: 0})
-    dialog.empty().append(frame).dialog('widget').resize();
+    var buttons = {}, iframe = $('<iframe>').attr({src: url, frameborder: 0});
 
     // Change [Next Step] button with [Save] button
-    buttons = {};
     buttons[rcmail.get_label('save')] = function() {
       var win = $('iframe', dialog).get(0).contentWindow;
       win.rcmail.managesieve_save();
     };
-    dialog.dialog('option', 'buttons', buttons);
+    buttons[rcmail.get_label('cancel')] = function() { $(this).dialog('destroy'); };
+
+    dialog.dialog('destroy');
+
+    rcmail.env.managesieve_dialog = dialog = rcmail.show_popup_dialog(
+      iframe, title, buttons, $.extend(props, {button_classes: ['mainaction save', 'cancel']})
+    );
   };
 
-  // show dialog window
-  dialog.dialog({
-    modal: false,
-    resizable: true,
-    closeOnEscape: true,
-    title: this.get_label('managesieve.newfilter'),
-    close: function() { rcmail.managesieve_dialog_close(); },
-    buttons: buttons,
-    minWidth: 600,
-    minHeight: 300,
-    height: 250
-  }).show();
-
-  this.env.managesieve_dialog = dialog;
+  buttons[this.get_label('cancel')] = function() { $(this).dialog('destroy'); };
+
+  this.env.managesieve_dialog = dialog = this.show_popup_dialog(
+    dialog, title, buttons, $.extend(props, {button_classes: ['mainaction next', 'cancel']})
+  );
 }
 
 rcube_webmail.prototype.managesieve_dialog_close = function()
 {
-  var dialog = this.env.managesieve_dialog;
-
-  // BUG(?): if we don't remove the iframe first, it will be reloaded
-  dialog.html('');
-  dialog.dialog('destroy').hide();
+  this.env.managesieve_dialog.dialog('destroy');
 }
 
 rcube_webmail.prototype.managesieve_dialog_resize = function(o)
@@ -1179,5 +1156,8 @@ rcube_webmail.prototype.managesieve_dialog_resize = function(o)
     height = form.height(),
     w = win.width(), h = win.height();
 
+  if (height < 100)
+    return;
+
   dialog.dialog('option', { height: Math.min(h-20, height+120), width: Math.min(w-20, width+65) });
 }
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index c8241303c..9c8f1b78b 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -85,10 +85,10 @@ class managesieve extends rcube_plugin
         // include styles
         $skin_path = $this->local_skin_path();
         if ($sieve_action || ($this->rc->task == 'settings' && empty($_REQUEST['_framed']))) {
-            $this->include_stylesheet("$skin_path/managesieve.css");
+            $this->include_stylesheet("$skin_path/managesieve.css", true);
         }
         else if ($this->rc->task == 'mail') {
-            $this->include_stylesheet("$skin_path/managesieve_mail.css");
+            $this->include_stylesheet("$skin_path/managesieve_mail.css", true);
         }
 
         $this->ui_initialized = true;
diff --git a/plugins/managesieve/skins/classic/managesieve.css b/plugins/managesieve/skins/classic/managesieve.css
index fc2a5a94c..bf74a2a00 100644
--- a/plugins/managesieve/skins/classic/managesieve.css
+++ b/plugins/managesieve/skins/classic/managesieve.css
@@ -117,6 +117,20 @@ body.iframe
   color: #666666;
 }
 
+filter-form .col-form-label {
+  display: inline-block;
+  min-width: 75px;
+  line-height: 2.5;
+}
+
+#filter-form .col-form-label + div {
+  display: inline;
+}
+
+#filter-form div.flexbox {
+  margin: 0;
+}
+
 #rules, #actions
 {
   margin-top: 5px;
@@ -161,11 +175,15 @@ td.advbutton a
 {
   display: block;
   padding-top: 14px;
-  height: 6px;
+  height: 14px;
   width: 12px;
   text-decoration: none;
 }
 
+td.advbutton a span {
+  display: none;
+}
+
 td.advbutton a.show
 {
   background: url(images/down_small.gif?v=8629.106) center no-repeat;
@@ -305,6 +323,10 @@ span.sieve.error
   color: red;
 }
 
+#filter-form a.button span {
+  display: none;
+}
+
 a.button.add
 {
   background: url(images/add.png?v=a165.280) no-repeat;
diff --git a/plugins/managesieve/skins/elastic/templates/filteredit.html b/plugins/managesieve/skins/elastic/templates/filteredit.html
new file mode 100644
index 000000000..fa2fc3884
--- /dev/null
+++ b/plugins/managesieve/skins/elastic/templates/filteredit.html
@@ -0,0 +1,17 @@
+<roundcube:include file="includes/layout.html" />
+
+<roundcube:if condition="env:task != 'mail'" />
+	<h1 class="voice"><roundcube:label name="managesieve.filterdef" /></h1>
+<roundcube:endif />
+
+<div class="formcontent">
+	<roundcube:object name="filterform" id="filter-form" class="propform" compact-form="true" />
+</div>
+
+<roundcube:if condition="env:task != 'mail'" />
+<div class="formbuttons">
+	<roundcube:button command="plugin.managesieve-save" class="primary button save" label="save" />
+</div>
+<roundcube:endif />
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/managesieve/skins/elastic/templates/managesieve.html b/plugins/managesieve/skins/elastic/templates/managesieve.html
new file mode 100644
index 000000000..113474e00
--- /dev/null
+++ b/plugins/managesieve/skins/elastic/templates/managesieve.html
@@ -0,0 +1,76 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+<roundcube:include file="includes/settings-menu.html" />
+
+<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="managesieve.filters" /></h1>
+
+<!--
+<div id="settings-right" role="main">
+  <roundcube:if condition="!env:managesieve_no_set_list" />
+  <div id="filtersetslistbox" class="uibox listbox" aria-labelledby="aria-label-filtersets">
+    <h2 class="boxtitle" id="aria-label-filtersets"><roundcube:label name="managesieve.filtersets" /></h2>
+    <div class="scroller withfooter">
+    <roundcube:object name="filtersetslist" id="filtersetslist" class="listing" summary="managesieve.ariasummaryfiltersetslist" type="list" noheader="true" role="listbox" />
+    </div>
+    <div class="boxfooter">
+      <roundcube:button command="plugin.managesieve-setadd" type="link" title="managesieve.filtersetadd" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="filtersetmenulink" id="filtersetmenulink" type="link" title="moreactions" class="listbutton groupactions" onclick="return UI.toggle_popup('filtersetmenu', event)" innerClass="inner" content="&#9881;" aria-haspopup="true" aria-expanded="false" aria-owns="filtersetmenu-menu" />
+    </div>
+  </div>
+  <div id="filtersscreen">
+  <roundcube:else />
+  <div id="filtersscreen" class="nosetlist">
+  <roundcube:endif />
+</div>
+-->
+
+<!-- filters list -->
+<div class="list listbox selected" aria-labelledby="aria-label-filters">
+	<div class="header">
+		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
+		<span id="aria-label-responseslist" class="header-title"><roundcube:label name="managesieve.filters" /></span>
+		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+	</div>
+	<div class="scroller">
+		<roundcube:object name="filterslist" id="filterslist" class="listing" noheader="true"
+			role="listbox" data-list="filters_list" />
+	</div>
+	<div class="footer"></div>
+</div>
+
+<!-- filter details frame -->
+<div class="content" role="main">
+	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
+		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title"></span>
+		<!-- toolbar -->
+		<div id="responsestoolbar" class="toolbar">
+			<roundcube:button command="plugin.managesieve-add" type="link"
+				label="create" title="managesieve.filteradd"
+				class="button create disabled" classAct="button create" innerClass="inner" />
+			<roundcube:button command="plugin.managesieve-del" type="link"
+				label="delete" title="delete" innerClass="inner"
+				class="button delete disabled" classAct="button delete" />
+		</div>
+	</div>
+	<h2 id="aria-label-filterframe" class="voice"><roundcube:label name="managesieve.arialabelfilterform" /></h2>
+	<roundcube:object name="filterframe" id="filter-frame" src="/watermark.html" title="managesieve.arialabelfilterform"
+		aria-labelledby="aria-label-filterform" />
+</div>
+
+<div id="filterset-menu" class="popupmenu">
+	<h3 id="aria-label-setactions" class="voice"><roundcube:label name="managesieve.arialabelfiltersetactions" /></h3>
+	<ul class="toolbarmenu" id="filtersetmenu-menu" role="menu" aria-labelledby="aria-label-setactions">
+		<roundcube:button type="link-menuitem" command="plugin.managesieve-setact" label="managesieve.enable" classAct="active" /></li>
+		<roundcube:button type="link-menuitem" command="plugin.managesieve-setdel" label="delete" classAct="active" /></li>
+		<roundcube:if condition="env:raw_sieve_editor != false" />
+			<roundcube:button type="link-menuitem" command="plugin.managesieve-seteditraw" label="managesieve.filterseteditraw" classAct="active" /></li>
+		<roundcube:endif />
+		<li role="menuitem" class="separator_above">
+		<roundcube:button type="link-menuitem" command="plugin.managesieve-setget" label="download" classAct="active" /></li>
+		<roundcube:container name="filtersetoptions" id="filterset-menu" />
+	</ul>
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/managesieve/skins/elastic/templates/setedit.html b/plugins/managesieve/skins/elastic/templates/setedit.html
new file mode 100644
index 000000000..fdac20666
--- /dev/null
+++ b/plugins/managesieve/skins/elastic/templates/setedit.html
@@ -0,0 +1,13 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:label name="managesieve.newfilterset" /></h1>
+
+<div class="formcontent">
+	<roundcube:object name="filtersetform" class="propform" />
+</div>
+
+<div class="formbuttons">
+	<roundcube:button command="plugin-managesieve-save" class="primary button save" label="save" />
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/managesieve/skins/elastic/templates/seteditraw.html b/plugins/managesieve/skins/elastic/templates/seteditraw.html
new file mode 100644
index 000000000..7c73e65d4
--- /dev/null
+++ b/plugins/managesieve/skins/elastic/templates/seteditraw.html
@@ -0,0 +1,13 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:label name="managesieve.filterseteditraw" /></h1>
+
+<div class="formcontent">
+	<roundcube:object name="filterseteditraw" class="propform" />
+</div>
+
+<div class="formbuttons">
+	<roundcube:button command="plugin.managesieve-save" class="primary button save" label="save" />
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/managesieve/skins/elastic/templates/vacation.html b/plugins/managesieve/skins/elastic/templates/vacation.html
new file mode 100644
index 000000000..aa97da9d6
--- /dev/null
+++ b/plugins/managesieve/skins/elastic/templates/vacation.html
@@ -0,0 +1,23 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+<roundcube:include file="includes/settings-menu.html" />
+
+<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="managesieve.vacation" /></h1>
+
+<div class="content selected" role="main">
+	<div class="header">
+		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title"></span>
+	</div>
+	<div class="formcontainer scroller" aria-labelledby="aria-label-vacationform">
+		<div class="formcontent">
+			<h2 class="voice" id="aria-label-vacationform"><roundcube:label name="managesieve.vacation" /></h2>
+			<roundcube:object name="vacationform" id="vacationform" class="propform" />
+		</div>
+		<div class="formbuttons">
+			<roundcube:button command="plugin.managesieve-save" class="primary button save" label="save" />
+		</div>
+	</div>
+</div>
+
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/managesieve/skins/larry/managesieve.css b/plugins/managesieve/skins/larry/managesieve.css
index fde68a38a..8de38af2e 100644
--- a/plugins/managesieve/skins/larry/managesieve.css
+++ b/plugins/managesieve/skins/larry/managesieve.css
@@ -101,6 +101,16 @@ body.iframe
   vertical-align: middle;
 }
 
+#filter-form .col-form-label {
+  display: inline-block;
+  min-width: 75px;
+  line-height: 2.5;
+}
+
+#filter-form .col-form-label + div {
+  display: inline;
+}
+
 #rules, #actions
 {
   margin-top: 5px;
@@ -134,28 +144,38 @@ div.rulerow table, div.actionrow table
   vertical-align: top;
 }
 
+#filter-form div.flexbox {
+  margin: 0;
+}
+
 td.advbutton
 {
   width: 1%;
+  overflow: hidden;
 }
 
 td.advbutton a
 {
   display: block;
-  padding-top: 14px;
+  padding-top: 16px;
   height: 6px;
   width: 12px;
   text-decoration: none;
 }
 
+td.advbutton a span
+{
+  display: none;
+}
+
 td.advbutton a.show
 {
-  background: url(images/down_small.gif?v=8629.106) center no-repeat;
+  background: url(images/down_small.gif) center no-repeat;
 }
 
 td.advbutton a.hide
 {
-  background: url(images/up_small.gif?v=c56c.106) center no-repeat;
+  background: url(images/up_small.gif) center no-repeat;
 }
 
 td.rowbuttons
@@ -292,9 +312,14 @@ span.sieve.error
   border-radius: 0;
 }
 
+#filter-form a.button span
+{
+  display: none;
+}
+
 #filter-form a.button.add
 {
-  background: url(images/add.png?v=a165.280) no-repeat;
+  background: url(images/add.png) no-repeat;
   width: 30px;
   height: 20px;
   margin-right: 4px;
@@ -303,7 +328,7 @@ span.sieve.error
 
 #filter-form a.button.del
 {
-  background: url(images/del.png?v=3c27.247) no-repeat;
+  background: url(images/del.png) no-repeat;
   width: 30px;
   height: 20px;
   display: inline-block;
@@ -414,7 +439,7 @@ td.rowtargets > span.listarea
   display: inline-block;
   width: 16px;
   height: 16px;
-  background: url(images/erase.png?v=3052.453) -1px -1px no-repeat #eee;
+  background: url(images/erase.png) -1px -1px no-repeat #eee;
   cursor: pointer;
 }
 
@@ -435,7 +460,7 @@ body.iframe.mail #filter-form
 
 /* vacation form */
 #settings-sections .vacation a {
-  background-image: url(images/vacation_icons.png?v=e738.767);
+  background-image: url(images/vacation_icons.png);
   background-repeat: no-repeat;
   background-position: 7px 1px;
 }