diff --git a/modoboa/extensions/webmail/static/webmail/js/webmail.js b/modoboa/extensions/webmail/static/webmail/js/webmail.js
index e3d754112..0514d99e4 100644
--- a/modoboa/extensions/webmail/static/webmail/js/webmail.js
+++ b/modoboa/extensions/webmail/static/webmail/js/webmail.js
@@ -194,6 +194,9 @@ Webmail.prototype = {
         var curmb = this.get_current_mailbox();
 
         $(window).unbind("resize");
+        if (!$('li[name="' + curmb + '"]').hasClass("active")) {
+            this.load_and_select_mailbox(curmb);
+        }
         this.enable_mb_actions();
         for (var idx in this.options.ro_mboxes) {
             if (curmb == this.options.ro_mboxes[idx]) {
@@ -770,12 +773,7 @@ Webmail.prototype = {
      * 'listmailbox' callback
      */
     listmailbox_callback: function(resp) {
-        var curmb = this.get_current_mailbox();
-
         this.store_nav_params();
-        if (!$('li[name="' + curmb + '"]').hasClass("active")) {
-            this.load_and_select_mailbox(curmb);
-        }
         this.page_update(resp);
         $("#emails").htmltable();
         this.htmltable = $("#emails").data("htmltable");
diff --git a/modoboa/extensions/webmail/templatetags/webextras.py b/modoboa/extensions/webmail/templatetags/webextras.py
index 0ca288496..e3a704745 100644
--- a/modoboa/extensions/webmail/templatetags/webextras.py
+++ b/modoboa/extensions/webmail/templatetags/webextras.py
@@ -130,7 +130,6 @@ def print_mailboxes(tree, selected=None, withunseen=False, selectonly=False):
         result += "<li name='%s' class='droppable %s'>\n" % (name, cssclass)
         if mbox.has_key("sub"):
             if selected is not None and selected != name and selected.count(name):
-                print "%s is visible" % name
                 ul_state = "visible"
                 div_state = "expanded"
             else: