diff --git a/extensions/amavis_quarantine/templates/amavis_quarantine/index.html b/extensions/amavis_quarantine/templates/amavis_quarantine/index.html
index 5c979149c..8ef7e1ec7 100644
--- a/extensions/amavis_quarantine/templates/amavis_quarantine/index.html
+++ b/extensions/amavis_quarantine/templates/amavis_quarantine/index.html
@@ -2,9 +2,9 @@
 {% load i18n %}
 {% block html_head %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}amavis_quarantine/css/quarantine.css" />
+<script type="text/javascript" src="{{ MEDIA_URL }}amavis_quarantine/js/quarantine.js"></script>
 {{ block.super }}
-{% endblock %}
-{% block js %}
+<script type="text/javascript">
   mysubmit = function(event, name) {
     event.stop();
     var selection = new Array();
@@ -27,106 +27,10 @@
     });
     $("listingform").send();
   }
-
-  updatehash = function(evt) {
-    evt.stop();
-    current_anchor.parse_string(evt.target.get("href"), true).setparams(navparams);
-    current_anchor.update();
-  }
-
-  appendhash = function(evt) {
-    evt.stop();
-    location.hash += evt.target.get("href");
-  }
-
-  updateparams = function(evt) {
-    evt.stop();
-    current_anchor.updateparams(evt.target.get("href"));
-    current_anchor.update();
-  }
-
-  register_callback("_listing", function(resp) {
-    updatelisting(resp);
-
-    tbl = new HtmlTable($("emails"), {
-      useKeyboard: false,
-      selectable: true
-    });
-    if ($("toggleselect")) {
-      $("toggleselect").addEvent("click", function(evt) {
-        if ($$("tr[class*=table-tr-selected]").length) {
-          tbl.selectNone();
-        } else {
-          tbl.selectAll();
-        }
-      });
-    }
-    $$("a[name=selectmsgs]").addEvent("click", function(evt) {
-      evt.stop();
-      var type = evt.target.get("href");
-      if (!$chk(type)) {
-        $$("tr[class*=table-tr-selected]").each(function(item) {
-          item.removeClass("table-tr-selected");
-        });
-        if ($("toggleselect").checked) {
-          $("toggleselect").checked = false;
-          tbl.selectNone();
-        }
-        return;
-      }
-      $$("td[name=type]").each(function(item) {
-        if (item.get("html").trim() == type) {
-          item.getParent().addClass("table-tr-selected");
-        }
-      });
-    });
-    $$("a[name=release]").addEvent("click", function(event) {
-      if (!checkTableSelection("{% trans "Release this selection?" %}")) {
-        event.stop();
-        return;
-      }
-      mysubmit(event, "release");
-    });
-    $$("a[name=delete]").addEvent("click", function(event) {
-      if (!checkTableSelection("{% trans "Delete this selection?" %}")) {
-        event.stop();
-        return;
-      }
-      mysubmit(event, "delete");
-    });
-    searchbox_init();
-    $$("tr").addEvent("dblclick", viewmail);
-  });
-
-  actioncallback = function(resp) {
-    $("listing").set("html", "");
-    $("menubar").set("html", "");
-    $("navbar").set("html", "");
-    if (resp.status == "ok") {
-      infobox.info(resp.message);
-    } else {
-      infobox.error(resp.message);
-    }
-    infobox.hide(1);
-    current_anchor.parse_string(resp.url, true).setparams(navparams);
-    current_anchor.update(1);
-  }
-
-  actionclick = function(evt) {
-    evt.stop();
-    new Request.JSON({
-      url: evt.target.get("href"), 
-      onSuccess: actioncallback
-    }).get();
-  }
-
-  register_callback("viewmail", function(resp) {
-    updatelisting(resp);
-    $$("a[name=back]").addEvent("click", updatehash);
-    $$("a[name=delete]").addEvent("click", actionclick);
-    $$("a[name=release]").addEvent("click", actionclick);
-    $$("a[name=viewmode]").addEvent("click", updateparams);
-    setDivHeight("mailcontent", 5, 0);
-  });
+</script>
+{% endblock %}
+{% block js %}
+  register_callback("_listing", listing_cb);
+  register_callback("viewmail", viewmail_cb);
 {% endblock %}
 {% block middletitle %}{% trans "Quarantine" %}{% endblock %}
diff --git a/extensions/webmail/static/css/folders.css b/extensions/webmail/static/css/folders.css
index 25400f3ef..259c53747 100644
--- a/extensions/webmail/static/css/folders.css
+++ b/extensions/webmail/static/css/folders.css
@@ -1,6 +1,6 @@
 #folders {
     float: left;
-    width: 150px;
+    width: 170px;
 }
 
 #folders2 {
@@ -23,10 +23,24 @@
     text-align: center;
 }
 
+div.boxtitle {
+    text-align: center; 
+    font-weight: bold;
+    margin: 5px auto;
+    width: 100px;
+}
+
+.boxtitle a {
+    float: left;
+}
+
+.boxtitle label {
+    float: left;
+}
+
 .box h3 {
     font-size: small;
     margin: 2px 0px 2px 0px;
-    text-align: center;
 }
 
 .box ul {
@@ -73,10 +87,6 @@ a.block {
     background-color: #6AB0C5;
 }
 
-img.aligned {
-    float: right;
-}
-
 img.footer {
     float: left;
     margin-top: 10px;
diff --git a/extensions/webmail/static/js/fdmenu.js b/extensions/webmail/static/js/fdmenu.js
index 97fc1ebd3..e966b75ed 100644
--- a/extensions/webmail/static/js/fdmenu.js
+++ b/extensions/webmail/static/js/fdmenu.js
@@ -78,7 +78,6 @@ var FdMenu = new Class({
           this.hide();
         }
       }.bind(this));
-      //this.fx = new Fx.Slide(this.container);
     },
 
     show: function(origin, folder) {
diff --git a/extensions/webmail/templates/webmail/folders.html b/extensions/webmail/templates/webmail/folders.html
index 5956654a9..78a838579 100644
--- a/extensions/webmail/templates/webmail/folders.html
+++ b/extensions/webmail/templates/webmail/folders.html
@@ -1,12 +1,15 @@
 {% load i18n %}
 {% load webextras %}
 {% if titlebar %}
-<a href="{% url extensions.webmail.views.newfolder %}" class="boxed"
-   rel="{handler: 'iframe', size: {x: 350, y: 400}}">
-  <img class="aligned" src="{{MEDIA_URL}}pics/add.png"
-       alt="{% trans 'Add a new folder' %}"/>
-</a>
-<h3>{% trans "Folders" %}</h3>
+<div class="boxtitle">
+  <a href="{% url extensions.webmail.views.newfolder %}" class="boxed"
+     rel="{handler: 'iframe', size: {x: 350, y: 400}}">
+    <img src="{{MEDIA_URL}}pics/add.png"
+         alt="{% trans 'Add a new folder' %}"/>
+  </a>
+  <label class="aligned">{% trans "Folders" %}</label>
+  <div class="spacer"></div>
+</div>
 {% endif %}
 <ul>
   {% print_folders folders selected withunseen withmenu %}
diff --git a/extensions/webmail/templates/webmail/index.html b/extensions/webmail/templates/webmail/index.html
index 76faf1927..948aa0a28 100644
--- a/extensions/webmail/templates/webmail/index.html
+++ b/extensions/webmail/templates/webmail/index.html
@@ -3,6 +3,7 @@
 {% block html_head %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}webmail/css/webmail.css" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}webmail/css/folders.css" />
+<script type="text/javascript" src="{{ MEDIA_URL }}js/ckeditor/ckeditor.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}webmail/js/fdmenu.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}webmail/js/webmail.js"></script>
 {{ block.super }}
diff --git a/templates/common/email_listing.html b/templates/common/email_listing.html
index 800326063..3c283df94 100644
--- a/templates/common/email_listing.html
+++ b/templates/common/email_listing.html
@@ -4,7 +4,6 @@
 {% block html_head %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/searchbar.css" />
 <script type="text/javascript" src="{{ MEDIA_URL }}js/ProgressBar.js"></script>
-<script type="text/javascript" src="{{ MEDIA_URL }}js/ckeditor/ckeditor.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}js/email_listing.js"></script>
 {% block css %}{% endblock %}
 <style type="text/css">