diff --git a/program/lib/Roundcube/rcube_output.php b/program/lib/Roundcube/rcube_output.php
index 27acc7075..f1f2d173e 100644
--- a/program/lib/Roundcube/rcube_output.php
+++ b/program/lib/Roundcube/rcube_output.php
@@ -306,7 +306,9 @@ abstract class rcube_output
         }
         else if ($type == 'select') {
             $input = new html_select($attrib);
-            $input->add('---', '');
+            if (empty($attrib['skip-empty'])) {
+                $input->add('---', '');
+            }
             $input->add(array_values($attrib['options']), array_keys($attrib['options']));
         }
         else if ($type == 'password' || $attrib['type'] == 'password') {