diff --git a/extensions/webmail/static/css/webmail.css b/extensions/webmail/static/css/webmail.css
index 705868656..93d87f32d 100644
--- a/extensions/webmail/static/css/webmail.css
+++ b/extensions/webmail/static/css/webmail.css
@@ -19,9 +19,9 @@ html > body #listing {
 
 /*thead tr {
   position: relative;
-  top: expression(offsetParent.scrollTop); /*IE5+ only*/
-z-index: 1;
-padding: 0;
+  top: expression(offsetParent.scrollTop);
+  z-index: 1;
+  padding: 0;
 }*/
 
 /*table#emails > tbody {
@@ -175,6 +175,18 @@ textarea:hover {
 }
 
 /* Progress bar */
+#footer {
+    color: white;
+    font-weight: bold;
+    font-size: 1em;
+}
+
+#quotalabel {
+    float: left;
+    padding: 7px 2px 0 5px;
+    display: none;
+}
+
 #quotabox {
     display: none;
     float: left;
@@ -192,14 +204,11 @@ textarea:hover {
 }
 
 #perc { 
-    background: url(../pics/ajax-loader.gif) right center no-repeat;
+    background: url(../pics/progressbar.gif) right center no-repeat;
     height: 19px; 
 }
 
 #quotatext { 
-    font-family:tahoma, arial, sans-serif; 
-    font-size:11px; 
-    color:#000;
-    padding: 3px 0 0 10px;
+    padding: 2px 0 0 2px;
     float: left;
 }
\ No newline at end of file
diff --git a/extensions/webmail/templates/compose.html b/extensions/webmail/templates/compose.html
index 76cb4dbc9..ae597574f 100644
--- a/extensions/webmail/templates/compose.html
+++ b/extensions/webmail/templates/compose.html
@@ -5,8 +5,7 @@
       {% include "common/genericform.html" %}
     </div>
     {% if body %}
-    <textarea id="id_body" name="id_body">{% if bodyheader %}{{ bodyheader }}{% endif %}
-{{ body }}
+    <textarea id="id_body" name="id_body">{% if bodyheader %}{{ bodyheader }}{% endif %}{{ body }}
 </textarea>
     {% else %}
     <textarea id="id_body" name="id_body"></textarea>
diff --git a/extensions/webmail/templates/index.html b/extensions/webmail/templates/index.html
index 65eb8ac8f..4fb3338ac 100644
--- a/extensions/webmail/templates/index.html
+++ b/extensions/webmail/templates/index.html
@@ -21,6 +21,7 @@
     if ($defined(resp.quota) && resp.quota != "-1") {
       quota_pb.set(resp.quota);
       $("quotabox").setStyle("display", "block");
+      $("quotalabel").setStyle("display", "block");
     }
     $$("a[name=loadfolder]").addEvent("click", foldercallback);
     $$("a[name=compose]").addEvent("click", loadCompose);
@@ -306,6 +307,7 @@
 </div>
 {% endblock %}
 {% block footer %}
+<div id="quotalabel">{% trans "Mailbox quota" %}</div>
 <div id="quotabox"></div>
 {{ block.super }}
 {% endblock %}
diff --git a/extensions/webmail/views.py b/extensions/webmail/views.py
index 5aba3a4cd..60895dcaf 100644
--- a/extensions/webmail/views.py
+++ b/extensions/webmail/views.py
@@ -207,10 +207,9 @@ def render_compose(request, form, posturl, bodyheader=None, body=None,
     if insert_signature:
         if body == None:
             body = ""
-        body += """
----
-%s
-""" % parameters.get_user(request.user, "webmail", "SIGNATURE")
+        signature = parameters.get_user(request.user, "webmail", "SIGNATURE")
+        if signature != "":
+            body += "\n---\n%s" % signature
 
     content = render_to_string("webmail/compose.html", {
             "form" : form, "bodyheader" : bodyheader, "body" : body,
diff --git a/static/css/bg_e.png b/static/css/bg_e.png
new file mode 100644
index 000000000..17811a0ff
Binary files /dev/null and b/static/css/bg_e.png differ
diff --git a/static/css/bg_n.png b/static/css/bg_n.png
new file mode 100644
index 000000000..d8b7768a5
Binary files /dev/null and b/static/css/bg_n.png differ
diff --git a/static/css/bg_ne.png b/static/css/bg_ne.png
new file mode 100644
index 000000000..92f8d5e0e
Binary files /dev/null and b/static/css/bg_ne.png differ
diff --git a/static/css/bg_nw.png b/static/css/bg_nw.png
new file mode 100644
index 000000000..bc7ed4927
Binary files /dev/null and b/static/css/bg_nw.png differ
diff --git a/static/css/bg_s.png b/static/css/bg_s.png
new file mode 100644
index 000000000..e55f927d4
Binary files /dev/null and b/static/css/bg_s.png differ
diff --git a/static/css/bg_se.png b/static/css/bg_se.png
new file mode 100644
index 000000000..f9ff05ce9
Binary files /dev/null and b/static/css/bg_se.png differ
diff --git a/static/css/bg_sw.png b/static/css/bg_sw.png
new file mode 100644
index 000000000..739044483
Binary files /dev/null and b/static/css/bg_sw.png differ
diff --git a/static/css/bg_w.png b/static/css/bg_w.png
new file mode 100644
index 000000000..71c89d65d
Binary files /dev/null and b/static/css/bg_w.png differ
diff --git a/static/pics/calendar.gif b/static/pics/calendar.gif
new file mode 100644
index 000000000..ca17b26db
Binary files /dev/null and b/static/pics/calendar.gif differ