diff --git a/modoboa/extensions/webmail/static/webmail/css/attachments.css b/modoboa/extensions/webmail/static/webmail/css/attachments.css
index f08061b64..b4c0de430 100644
--- a/modoboa/extensions/webmail/static/webmail/css/attachments.css
+++ b/modoboa/extensions/webmail/static/webmail/css/attachments.css
@@ -37,4 +37,4 @@ div.row label {
 
 #id_attachment {
     width: 290px;
-}
\ No newline at end of file
+}
diff --git a/modoboa/extensions/webmail/static/webmail/js/webmail.js b/modoboa/extensions/webmail/static/webmail/js/webmail.js
index ace4ba0ba..110b8c6ef 100644
--- a/modoboa/extensions/webmail/static/webmail/js/webmail.js
+++ b/modoboa/extensions/webmail/static/webmail/js/webmail.js
@@ -945,7 +945,7 @@ Webmail.prototype = {
             html: "<i class='icon-remove'></i>"
         });
         var $label = $("<label />", {html: fname});
-        var $div = $("<div />").append($delbtn, $label);
+        var $div = $("<div />", {'class': "row-fluid"}).append($delbtn, $label);
 
         $delbtn.click(this.del_attachment);
         $("#id_attachment").val("");
diff --git a/modoboa/extensions/webmail/templates/webmail/index.html b/modoboa/extensions/webmail/templates/webmail/index.html
index f4ee6373f..de45b6271 100644
--- a/modoboa/extensions/webmail/templates/webmail/index.html
+++ b/modoboa/extensions/webmail/templates/webmail/index.html
@@ -18,6 +18,7 @@ $(document).ready(function() {
         poller_url: "{% url 'modoboa.extensions.webmail.views.check_unseen_messages' %}",
         move_url: "{% url 'modoboa.extensions.webmail.views.move' %}",
         submboxes_url: "{% url 'modoboa.extensions.webmail.views.submailboxes' %}",
+        delattachment_url: "{% url 'modoboa.extensions.webmail.views.delattachment' %}",
         deflocation: "{{ deflocation }}",
         defcallback: "{{ defcallback }}",
         ro_mboxes: {% tolist ro_mboxes %},
diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py
index b7482d71c..730a1e4d3 100644
--- a/modoboa/extensions/webmail/views.py
+++ b/modoboa/extensions/webmail/views.py
@@ -184,7 +184,7 @@ def editfolder(request, tplname="webmail/folder.html"):
             if form.cleaned_data["name"] != oldname \
                     or (pf != oldparent):
                 newname = form.cleaned_data["name"] if pf is None \
-                    else "%s.%s" % (pf, form.cleaned_data["name"])
+                    else mbc.hdelimiter.join([pf, form.cleaned_data["name"]])
                 mbc.rename_folder(request.POST["oldname"], newname)
                 res["oldmb"] = oldname
                 res["newmb"] = form.cleaned_data["name"]