diff --git a/INSTALL b/INSTALL
index 493dc6ac4..d22e33cf6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -441,7 +441,7 @@ following configuration::
                 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
                 proxy_set_header Host $http_host;
                 proxy_redirect off;
-                proxy_set_header X-Forwarded-Protocol https;
+                proxy_set_header X-Forwarded-Protocol ssl;
 
                 if (!-f $request_filename) {
 			proxy_pass http://modoboa;
diff --git a/extensions/webmail/templates/webmail/index.html b/extensions/webmail/templates/webmail/index.html
index 08e07a62a..9c9443966 100644
--- a/extensions/webmail/templates/webmail/index.html
+++ b/extensions/webmail/templates/webmail/index.html
@@ -256,10 +256,10 @@
 	droppable.removeClass("dragging");
     };
 
-    restore_parent = function(item) {
+    restore_parent = function(drag, item) {
 	var parent = item.retrieve("parent");
 
-	this.element = parent;
+	drag.element = parent;
 	rtimer = refreshFolder.periodical({{ refreshrate }});
     };
 
@@ -267,7 +267,7 @@
 	this.element.dispose();
         delete(this.element);
         if (!droppable) {
-	    restore_parent(item);
+	    restore_parent(this, item);
 	    return;
         }
         droppable.removeClass("dragging");
@@ -283,7 +283,7 @@
     cancel_dragging = function(item) {
 	this.element.dispose();
         delete(this.element);
-	restore_parent(item);
+	restore_parent(this, item);
     };
 
     $$("td[class*=draggable]").each(function(item) {
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index cbc2c7331..654ae931b 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -440,7 +440,7 @@ msgstr "Alias de domaine"
 #: admin/templatetags/admin_extras.py:118 templates/admin/domains.html:22
 #: templates/admin/mbaliases.html:3
 msgid "Mailbox aliases"
-msgstr "Alias de boite aux lettres"
+msgstr "Alias de boite."
 
 #: admin/templatetags/admin_extras.py:133
 msgid "Add permission"
diff --git a/static/css/default.css b/static/css/default.css
index 63858f59b..a526c907d 100644
--- a/static/css/default.css
+++ b/static/css/default.css
@@ -39,7 +39,7 @@ div#footer {
 #menubar {
     margin: 5px;
     display: table;
-    width: 800px;
+    width: 730px;
     margin-top: 35px;
 }
 
diff --git a/templates/admin/domains.html b/templates/admin/domains.html
index 50c5969f8..92f87c618 100644
--- a/templates/admin/domains.html
+++ b/templates/admin/domains.html
@@ -11,7 +11,7 @@
 {% endblock %}
 {% block middletitle %}{% trans "Available domains" %}{% endblock %}
 {% block subcontent %}
-<div id="objects" name="domains" rel="300 190">
+<div id="objects" name="domains" rel="310 190">
   {% if not domains %}<div class="info">{% trans "No domain defined." %}</div>
   {% else %}
   <table id="objects_table">
diff --git a/templates/admin/domaliases.html b/templates/admin/domaliases.html
index 6cc06be70..62c38741c 100644
--- a/templates/admin/domaliases.html
+++ b/templates/admin/domaliases.html
@@ -2,7 +2,7 @@
 {% load i18n admin_extras libextras %}
 {% block pagetitle %}{% trans "Domain aliases" %}{% endblock %}
 {% block subcontent %}
-<div id="objects" name="domaliases" rel="300 190">
+<div id="objects" name="domaliases" rel="310 190">
   {% if not domaliases %}
   <div class="info">{% trans "No domain alias defined." %}</div>
   {% else %}
diff --git a/templates/admin/mailboxes.html b/templates/admin/mailboxes.html
index 09226d126..3165a7496 100644
--- a/templates/admin/mailboxes.html
+++ b/templates/admin/mailboxes.html
@@ -2,7 +2,7 @@
 {% load i18n admin_extras %}
 {% block pagetitle %}{% trans "Available mailboxes" %}{% endblock %}
 {% block subcontent %}
-<div id="objects" name="mailboxes" rel="300 320">
+<div id="objects" name="mailboxes" rel="310 320">
   {% if not mailboxes %}
   <div class="info">{% trans "No mailbox defined." %}</div>
   {% else %}
diff --git a/templates/admin/mbaliases.html b/templates/admin/mbaliases.html
index 2ab5f8904..f0176347f 100644
--- a/templates/admin/mbaliases.html
+++ b/templates/admin/mbaliases.html
@@ -2,7 +2,7 @@
 {% load i18n admin_extras %}
 {% block pagetitle %}{% trans "Mailbox aliases" %}{% endblock %}
 {% block subcontent %}
-<div id="objects" name="mbaliases" rel="300 300">
+<div id="objects" name="mbaliases" rel="310 300">
   {% if not aliases %}
   <div class="info">{% trans "No mailbox alias defined." %}</div>
   {% else %}