Index: branches/devel-framework/roundcubemail/program/include/html.php
===================================================================
--- branches/devel-framework/roundcubemail/program/include/html.php	(revision 5807)
+++ branches/devel-framework/roundcubemail/program/include/html.php	(revision 5822)
@@ -296,8 +296,8 @@
             }
             else if ($key=='value') {
-                $attrib_arr[] = $key . '="' . Q($value, 'strict', false) . '"';
+                $attrib_arr[] = $key . '="' . rcube_ui::Q($value, 'strict', false) . '"';
             }
             else {
-                $attrib_arr[] = $key . '="' . Q($value) . '"';
+                $attrib_arr[] = $key . '="' . rcube_ui::Q($value) . '"';
             }
         }
@@ -541,5 +541,5 @@
 
         if (!empty($value) && !preg_match('/mce_editor/', $this->attrib['class'])) {
-            $value = Q($value, 'strict', false);
+            $value = rcube_ui::Q($value, 'strict', false);
         }
 
@@ -615,5 +615,5 @@
                   in_array($option['text'], $select, true)) ? 1 : null);
 
-            $this->content .= self::tag('option', $attr, Q($option['text']));
+            $this->content .= self::tag('option', $attr, rcube_ui::Q($option['text']));
         }
         return parent::show();