diff --git a/extensions/amavis_quarantine/views.py b/extensions/amavis_quarantine/views.py
index b7c664679..3c5c0cb85 100644
--- a/extensions/amavis_quarantine/views.py
+++ b/extensions/amavis_quarantine/views.py
@@ -160,10 +160,13 @@ def viewmail(request, mail_id):
         rcpt = request.GET["rcpt"]
     else:
         rcpt = None
+
+    if request.user.has_mailbox:
         mb = Mailbox.objects.get(user=request.user)
-        msgrcpt = Msgrcpt.objects.get(mail=mail_id, rid__email=mb.full_address)
-        msgrcpt.rs = 'V'
-        msgrcpt.save()
+        if not rcpt or rcpt == mb.full_address:
+            msgrcpt = Msgrcpt.objects.get(mail=mail_id, rid__email=mb.full_address)
+            msgrcpt.rs = 'V'
+            msgrcpt.save()
     
     content = Template("""
 <iframe src="{{ url }}" id="mailcontent"></iframe>
diff --git a/static/js/searchbar.js b/static/js/searchbar.js
index 36bf020ec..b9f1860bc 100644
--- a/static/js/searchbar.js
+++ b/static/js/searchbar.js
@@ -39,9 +39,9 @@
                     criteria: criteria
                 });
             } else {
-                this.options.navobj.deleteParam("pattern");
-                this.options.navobj.deleteParam("criteria");
-                this.options.navobj.deleteParam("page");
+                this.options.navobj.delparam("pattern");
+                this.options.navobj.delparam("criteria");
+                this.options.navobj.delparam("page");
             }
             this.options.navobj.update();
         }