diff --git a/modoboa/extensions/amavis/static/amavis/js/quarantine.js b/modoboa/extensions/amavis/static/amavis/js/quarantine.js
index f19ca9132..5be1ecf4a 100644
--- a/modoboa/extensions/amavis/static/amavis/js/quarantine.js
+++ b/modoboa/extensions/amavis/static/amavis/js/quarantine.js
@@ -131,7 +131,7 @@ Quarantine.prototype = {
     },
 
     _send_action: function(e, message) {
-        var $link = $(e.target);
+        var $link = get_target(e, "a");
 
         e.preventDefault();
         if (!confirm(message)) {
@@ -160,7 +160,7 @@ Quarantine.prototype = {
     headers: function(e) {
         e.preventDefault();
 
-        var $link = $(e.target);
+        var $link = get_target(e, "a");
         var $mailcontent = $("#mailcontent").contents();
         var $headers = $mailcontent.find("#emailheaders");
         var $rawheaders = $mailcontent.find("#rawheaders");
diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py
index 6b5fb0b64..a1579f79d 100644
--- a/modoboa/extensions/amavis/views.py
+++ b/modoboa/extensions/amavis/views.py
@@ -19,7 +19,7 @@ from sql_listing import *
 
 def __get_current_url(request):
     if request.session.has_key("page"):
-        res = "?page=%s" % request.session["page"]
+        res = "listing?page=%s" % request.session["page"]
     else:
         res = ""
     params = "&".join(map(lambda p: "%s=%s" % (p, request.session[p]),