Minor bug fixes and visual enhancements

2 files changed, 3 insertions, 6 deletions

diff --git a/program/include/rcube_html.inc b/program/include/rcube_html.inc
index d5067cd40..d23760ade 100644
--- a/program/include/rcube_html.inc
+++ b/program/include/rcube_html.inc
@@ -636,7 +636,7 @@ class select extends rcube_form_element
     $value_str = $this->_conv_case(' value="%s"', 'attrib');
     
     if (!is_array($select))
-      $select = array((string)$select);
+      $select = array($select);
 
     foreach ($this->options as $option)
     {
diff --git a/program/js/app.js b/program/js/app.js
index d1f0c9376..bbd7bfc18 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1387,11 +1387,8 @@ function rcube_webmail()
   this.move_messages = function(mbox)
     {
     // exit if current or no mailbox specified or if selection is empty
-    if (!mbox || !this.env.uid || mbox==this.env.mailbox)
-      {
-      if (!this.message_list || !this.message_list.get_selection().length)
-        return;
-      }
+    if (!mbox || !this.env.uid || mbox == this.env.mailbox || !this.message_list || !this.message_list.get_selection().length)
+      return;
 
     var lock = false;
     var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');