- Fix return to first page from e-mail screen (#1486105)

2 files changed, 4 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 561bb60a7..9ea85f052 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix return to first page from e-mail screen (#1486105)
 - Fix handling HTML comments in HTML messages (#1486189)
 - Fix folder/messagelist controls alignment - icons used (#1486072)
 - Fix LDAP addressbook shows 'Contact not found' error sometimes (#1486178)
diff --git a/program/js/app.js b/program/js/app.js
index d6fff123b..91d0f13b4 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1629,15 +1629,15 @@ function rcube_webmail()
     // also send search request to get the right messages
     if (this.env.search_request)
       add_url += '&_search='+this.env.search_request;
-      
+
     // set page=1 if changeing to another mailbox
-    if (!page)
+    if (!page && this.env.mailbox != mbox)
       {
       page = 1;
       this.env.current_page = page;
       this.show_contentframe(false);
       }
-    
+
     if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
       add_url += '&_refresh=1';