Only show new messages if they match the current search (#1484176)

git-svn-id: https://svn.roundcube.net/trunk@932 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 4 insertions, 3 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 5b9265b69..9bb85689a 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -1143,6 +1143,8 @@ function rcube_webmail()
       this.command('show');
     else if (list.key_pressed == list.DELETE_KEY)
       this.command('delete');
+    else
+      list.shiftkey = false;
     };
 
 
@@ -3483,7 +3485,7 @@ function rcube_webmail()
       }
 
     this.set_busy(true, 'checkingmail');
-    this.http_request('check-recent', '_t='+(new Date().getTime()), true);
+    this.http_request('check-recent', (this.env.search_request ? '_search='+this.env.search_request+'&' : '') + '_t='+(new Date().getTime()), true);
     };
 
 
diff --git a/roundcubemail/program/js/list.js b/roundcubemail/program/js/list.js
index de4d7c84a..06c355432 100644
--- a/roundcubemail/program/js/list.js
+++ b/roundcubemail/program/js/list.js
@@ -535,8 +535,6 @@ key_press: function(e)
   if (this.focused != true) 
     return true;
 
-  this.shiftkey = e.shiftKey;
-
   var keyCode = document.layers ? e.which : document.all ? event.keyCode : document.getElementById ? e.keyCode : 0;
   var mod_key = rcube_event.get_modifier(e);
   switch (keyCode)
@@ -547,6 +545,7 @@ key_press: function(e)
       break;
 
     default:
+      this.shiftkey = e.shiftKey;
       this.key_pressed = keyCode;
       this.trigger_event('keypress');
   }