- Applied fixes from trunk up to r5628

3 files changed, 4 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index ca225929e..6265ee415 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix expanding folders during drag&drop (#1488260)
+- Fix wrong postgres sequence name in upgrade from 0.6
 - Fix broken CREATE INDEX queries in SQLite DDL files (#1488255)
 
 RELEASE 0.7
diff --git a/SQL/postgres.update.sql b/SQL/postgres.update.sql
index c96669dc8..0db2e9ee0 100644
--- a/SQL/postgres.update.sql
+++ b/SQL/postgres.update.sql
@@ -127,7 +127,7 @@ CREATE TABLE searches (
     CONSTRAINT searches_user_id_key UNIQUE (user_id, "type", name)
 );
 
-DROP SEQUENCE messages_ids;
+DROP SEQUENCE message_ids;
 DROP TABLE messages;
 
 CREATE TABLE cache_index (
diff --git a/program/js/app.js b/program/js/app.js
index 76ea145fe..e1c436263 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1360,7 +1360,7 @@ function rcube_webmail()
               if (this.folder_auto_timer)
                 window.clearTimeout(this.folder_auto_timer);
 
-              this.folder_auto_expand = k;
+              this.folder_auto_expand = this.env.mailboxes[k].id;
               this.folder_auto_timer = window.setTimeout(function() {
                 rcmail.command('collapse-folder', rcmail.folder_auto_expand);
                 rcmail.drag_start(null);