diff --git a/modoboa/extensions/amavis/static/amavis/js/quarantine.js b/modoboa/extensions/amavis/static/amavis/js/quarantine.js
index bcb871eb1..41e25c253 100644
--- a/modoboa/extensions/amavis/static/amavis/js/quarantine.js
+++ b/modoboa/extensions/amavis/static/amavis/js/quarantine.js
@@ -260,7 +260,7 @@ Quarantine.prototype = {
     },
 
     deactivate_buttons: function($tr) {
-        if (!this.htmltable.current_selection().length) {
+        if (!this.htmltable || !this.htmltable.current_selection().length) {
             $("a[name=release-multi]").addClass('disabled');
             $("a[name=delete-multi]").addClass('disabled');
             $("#selectall").prop('checked', false);
diff --git a/modoboa/static/js/jquery.htmltable.js b/modoboa/static/js/jquery.htmltable.js
index 1a185552d..3a615cf50 100644
--- a/modoboa/static/js/jquery.htmltable.js
+++ b/modoboa/static/js/jquery.htmltable.js
@@ -97,6 +97,9 @@
             this.last_selection = null;
             this.current_selection().removeClass(this.options.tr_selected_class);
             $("tbody input[type=checkbox]").prop('checked', false);
+            if (this.options.tr_unselected_event != undefined) {
+                this.options.tr_unselected_event();
+            }
         },
 
         /*
@@ -104,7 +107,9 @@
          */
         select_row: function($row) {
             $row.addClass(this.options.tr_selected_class);
-
+            if (this.options.tr_selected_event != undefined) {
+                this.options.tr_selected_event($row);
+            }
         },
 
         keydown: function(e) {