diff --git a/extensions/webmail/static/js/webmail.js b/extensions/webmail/static/js/webmail.js
index 5e9dab972..988649142 100644
--- a/extensions/webmail/static/js/webmail.js
+++ b/extensions/webmail/static/js/webmail.js
@@ -14,8 +14,6 @@ Webmail.prototype = {
         move_url: "",
         submboxes_url: "",
         delattachment_url: "",
-        deflocation: "",
-        defcallback: "",
         ro_mboxes: ["INBOX"]
     },
 
@@ -25,8 +23,8 @@ Webmail.prototype = {
         this.editorid = "id_body";
 
         this.navobject = new History({
-            deflocation: this.options.deflocation,
-            defcallback: this.options.defcallback
+            deflocation: "?action=listmailbox",
+            defcallback: $.proxy(this.listmailbox_callback, this)
         });
         this.poller = new Poller(this.options.poller_url, {
             interval: this.options.poller_interval * 1000,
@@ -134,10 +132,37 @@ Webmail.prototype = {
      * Simple helper to retrieve the currently selected mailbox.
      */
     get_current_mailbox: function() {
-        if (this.navobject.getparam("action") != "listmailbox") {
-            return undefined;
+        return this.navobject.getparam("mbox", "INBOX");
+    },
+
+    /*
+     * Keep track of interesting navigation parameters in order to
+     * restore them later.
+     */
+    store_nav_params: function() {
+        var params = new Array("page", "order", "pattern", "criteria");
+
+        this.navparams = {};
+        for (var idx in params) {
+            this.navparams[params[idx]] = this.navobject.getparam(params[idx]);
         }
-        return this.navobject.getparam("name", "INBOX");
+    },
+
+    /*
+     * Restore navigation parameters previously stored via
+     * store_nav_params.
+     */
+    restore_nav_params: function() {
+        if (this.navparams === undefined) {
+            return;
+        }
+        var navobject = this.navobject;
+        $.each(this.navparams, function(key, value) {
+            if (value === undefined) {
+                return;
+            }
+            navobject.setparam(key, value);
+        });
     },
 
     /*
@@ -475,7 +500,7 @@ Webmail.prototype = {
             dataType: 'json',
             success: $.proxy(function(data) {
                 if (data.status == "ok") {
-                    this.remove_mbox_from_tree(this.navobject.getparam("name"));
+                    this.remove_mbox_from_tree(this.navobject.getparam("mbox"));
                     this.poller.resume();
                     $("body").notify("success", gettext("Mailbox removed"), 2000);
                 } else {
@@ -554,7 +579,7 @@ Webmail.prototype = {
             this.remove_mbox_from_tree($link.parent("li"));
             this.add_mailbox_to_tree(newparent, newname);
             if (this.navobject.getparam("action") == "listmailbox") {
-                this.navobject.setparam("name", newlocation).update();
+                this.navobject.setparam("mbox", newlocation).update();
             } else {
                 this.select_mailbox("INBOX");
             }
@@ -636,7 +661,7 @@ Webmail.prototype = {
         }
         this.navobject.reset().setparams({
            action: "listmailbox",
-           name: obj.attr("href")
+           mbox: obj.attr("href")
         }).update();
     },
 
@@ -719,9 +744,9 @@ Webmail.prototype = {
      * 'listmailbox' callback
      */
     listmailbox_callback: function(resp) {
-        //window.removeEvents("resize");
         var curmb = this.get_current_mailbox();
 
+        this.store_nav_params();
         if (!$('li[name="' + curmb + '"]').hasClass("active")) {
             this.load_and_select_mailbox(curmb);
         }
@@ -814,9 +839,10 @@ Webmail.prototype = {
         $("a[name=close]").click($.proxy(function(e) {
             e.preventDefault();
             var curmb = this.get_current_mailbox();
-            this.navobject.delparam("mailid")
-                .setparams({action: "listmailbox", name: curmb})
-                .update();
+            this.navobject.delparam("mailid").delparam("mbox")
+                .setparams({action: "listmailbox", mbox: curmb});
+            this.restore_nav_params();
+            this.navobject.update();
         }, this));
     },
 
diff --git a/extensions/webmail/templates/webmail/headers.html b/extensions/webmail/templates/webmail/headers.html
index ea795ecdb..b6665c98b 100644
--- a/extensions/webmail/templates/webmail/headers.html
+++ b/extensions/webmail/templates/webmail/headers.html
@@ -1,13 +1,11 @@
 {% extends "common/mailheaders.html" %}{% load i18n %}
-{% block extraheaders %}
-{% if attachments %}
-  <tr>
-    <th>{% trans "Attachments" %}</th>
-    <td>{% url modoboa.extensions.webmail.views.getattachment as url %}
+{% block extraheaders %}{% if attachments %}
+  <div class="row">
+    <div class="header">{% trans "Attachments" %}</div>
+    <div class="value">{% url modoboa.extensions.webmail.views.getattachment as url %}
       {% for key, fname in attachments.items %}
       <a href="{{ url }}?mbox={{ folder }}&mailid={{ mail_id }}&fname={{ fname }}&partnumber={{ key }}">{{ fname }}</a>
       {% endfor %}
-    </td>
-  </tr>
-{% endif %}
-{% endblock %}
+    </div>
+  </div>
+{% endif %}{% endblock %}
diff --git a/extensions/webmail/views.py b/extensions/webmail/views.py
index b1d7ad2fb..07c989522 100644
--- a/extensions/webmail/views.py
+++ b/extensions/webmail/views.py
@@ -308,10 +308,10 @@ def listmailbox(request, defmailbox="INBOX"):
     :param defmailbox: the default mailbox (when not present inside request arguments)
     :return: a dictionnary
     """
-    mbox = request.GET.get("name", defmailbox)
+    mbox = request.GET.get("mbox", defmailbox)
     set_nav_params(request)
     lst = ImapListing(request.user, request.session["password"],
-                      baseurl="?action=listmailbox&name=%s&" % mbox,
+                      baseurl="?action=listmailbox&mbox=%s&" % mbox,
                       folder=mbox, 
                       elems_per_page=int(parameters.get_user(request.user, "MESSAGES_PER_PAGE")),
                       **request.session["navparams"])
@@ -481,8 +481,7 @@ def index(request):
     else:
         if request.is_ajax():
             raise WebmailError(_("Bad request"))
-        response = dict(selection="webmail", deflocation="?action=listmailbox", 
-                        defcallback="wm_updatelisting")
+        response = dict(selection="webmail")
 
     curmbox = request.session.get("mbox", "INBOX")
     if not request.is_ajax():