Index: /trunk/roundcubemail/program/js/app.js
===================================================================
--- /trunk/roundcubemail/program/js/app.js	(revision 887)
+++ /trunk/roundcubemail/program/js/app.js	(revision 888)
@@ -2477,39 +2477,34 @@
     var row, folder;
     var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
-    if (this.env.subscriptionrows[id] &&
-        (folder = this.env.subscriptionrows[id][0]) &&
-        this.drag_active && this.check_droptarget(folder) &&
-        (folder != this.env.folder.replace(reg, '')) &&
-        (!folder.match(new RegExp('^'+RegExp.escape(this.env.folder+this.env.delimiter)))) &&
-        (row = document.getElementById(id)))
-      if (find_in_array(this.env.defaultfolders, folder)>=0)
-        {
-        if (this.env.folder.replace(reg, '')!='')
+
+    if (this.drag_active && (row = document.getElementById(id)))
+      if (this.env.subscriptionrows[id] &&
+          (folder = this.env.subscriptionrows[id][0]))
+        {
+        if (this.check_droptarget(folder) &&
+            (folder != this.env.folder.replace(reg, '')) &&
+            (!folder.match(new RegExp('^'+RegExp.escape(this.env.folder+this.env.delimiter)))))
           {
-          this.set_env('dstfolder', this.env.delimiter);
-          this.set_classname(this.subscription_list.frame, 'droptarget', true);
+          this.set_env('dstfolder', folder);
+          this.set_classname(row, 'droptarget', true);
           }
         }
+      else if (this.env.folder.match(new RegExp(RegExp.escape(this.env.delimiter))))
+        {
+        this.set_env('dstfolder', this.env.delimiter);
+        this.set_classname(this.subscription_list.frame, 'droptarget', true);
+        }
+    }
+
+
+  this.unfocus_subscription = function(id)
+    {
+      var row;
+      this.set_env('dstfolder', null);
+      if (this.env.subscriptionrows[id] &&
+          (row = document.getElementById(id)))
+        this.set_classname(row, 'droptarget', false);
       else
-        {
-        this.set_env('dstfolder', folder);
-        this.set_classname(row, 'droptarget', true);
-        }
-    }
-
-
-  this.unfocus_subscription = function(id)
-    {
-    var row, folder;
-    if (this.env.subscriptionrows[id] &&
-        (folder = this.env.subscriptionrows[id][0]) &&
-        (row = document.getElementById(id)))
-      {
-      this.set_env('dstfolder', null);
-      if (find_in_array(this.env.defaultfolders, folder)>=0)
         this.set_classname(this.subscription_list.frame, 'droptarget', false);
-      else
-        this.set_classname(row, 'droptarget', false);
-      }
     }