diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py
index aee63f5a5..d1f2b215a 100644
--- a/modoboa/admin/models.py
+++ b/modoboa/admin/models.py
@@ -694,7 +694,7 @@ class Mailbox(DatesAware):
             code, output = exec_cmd("doveadm user %s -f home" % self.full_address, 
                                     sudo_user=parameters.get_admin("MAILBOXES_OWNER"))
             if code:
-                raise AdminError(_("Failed to retrieve mailbox location"))
+                raise AdminError(_("Failed to retrieve mailbox location (%s)" % output))
             self.__mail_home = output.strip()
         return self.__mail_home
 
@@ -769,9 +769,10 @@ class Mailbox(DatesAware):
             pass
         else:
             q.delete()
-        super(Mailbox, self).delete()
         if not keepdir:
             self.delete_dir()
+        super(Mailbox, self).delete()
+
 
 @receiver(pre_delete, sender=Mailbox)
 def mailbox_deleted_handler(sender, **kwargs):
diff --git a/modoboa/admin/static/admin/js/admin.js b/modoboa/admin/static/admin/js/admin.js
index e8818199f..42619504d 100644
--- a/modoboa/admin/static/admin/js/admin.js
+++ b/modoboa/admin/static/admin/js/admin.js
@@ -228,7 +228,7 @@ Identities.prototype = {
         var deloptions = {};
 
         if (data.handle_mailboxes) {
-            deloptions["checkboxes"] = {keepdir: gettext("Do not delete mailbox directory")};
+            deloptions = {keepdir: gettext("Do not delete mailbox directory")};
         }
         $("a.filter").click($.proxy(this.filter_by_tag, this));