Fix bug where search was reset after returning from compose opened by reply button(s)

Conflicts:

	program/js/app.js

2 files changed, 4 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 069affb8c..e0cb73cac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ CHANGELOG Roundcube Webmail
 - Fix XSS issue in style attribute handling (#1490227)
 - Fix bug where Drafts list wasn't updated on draft-save action in new window (#1490225)
 - Fix so "set as default" option is hidden if identities_level > 1 (#1490226)
+- Fix bug where search was reset after returning from compose visited for reply
 
 RELEASE 1.0.4
 -------------
diff --git a/program/js/app.js b/program/js/app.js
index f132a2c3b..17fc99dc2 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -983,12 +983,9 @@ function rcube_webmail()
         url = {};
 
         if (this.task == 'mail') {
-          url._mbox = this.env.mailbox;
+          url = {_mbox: this.env.mailbox, _search: this.env.search_request};
           if (props)
             url._to = props;
-          // also send search request so we can go back to search result after message is sent
-          if (this.env.search_request)
-            url._search = this.env.search_request;
         }
         // modify url if we're in addressbook
         else if (this.task == 'addressbook') {
@@ -1089,9 +1086,9 @@ function rcube_webmail()
       case 'reply-list':
       case 'reply':
         if (uid = this.get_single_uid()) {
-          url = {_reply_uid: uid, _mbox: this.env.mailbox};
+          url = {_reply_uid: uid, _mbox: this.env.mailbox, _search: this.env.search_request};
+          // do reply-list, when list is detected and popup menu wasn't used
           if (command == 'reply-all')
-            // do reply-list, when list is detected and popup menu wasn't used
             url._all = (!props && this.env.reply_all_mode == 1 && this.commands['reply-list'] ? 'list' : 'all');
           else if (command == 'reply-list')
             url._all = 'list';