diff --git a/extensions/amavis_quarantine/templates/index.html b/extensions/amavis_quarantine/templates/index.html
index a3b394776..fd5704304 100644
--- a/extensions/amavis_quarantine/templates/index.html
+++ b/extensions/amavis_quarantine/templates/index.html
@@ -56,6 +56,7 @@ tr.table-tr-selected {
     updatelisting(resp);
 
     tbl = new HtmlTable($("emails"), {
+      useKeyboard: false,
       selectable: true
     });
     if ($("toggleselect")) {
diff --git a/extensions/webmail/main.py b/extensions/webmail/main.py
index 13a905220..7d3f4c80d 100644
--- a/extensions/webmail/main.py
+++ b/extensions/webmail/main.py
@@ -229,7 +229,7 @@ def send_mail(request, withctx=False, origmsg=None):
         msg["To"] = request.POST["to"]
         msg["Message-ID"] = make_msgid()
         msg["User-Agent"] = "MailNG"
-        msg["Date"] = formatdate()
+        msg["Date"] = formatdate(time.time(), True)
         if origmsg and origmsg.has_key("Message-ID"):
             msg["References"] = msg["In-Reply-To"] = origmsg["Message-ID"]
         rcpts = msg['To'].split(',')
diff --git a/templates/common/email_listing.html b/templates/common/email_listing.html
index 18c661a49..12ed2b48b 100644
--- a/templates/common/email_listing.html
+++ b/templates/common/email_listing.html
@@ -23,7 +23,6 @@
 {% block css %}{% endblock %}
 </style>
 
-<script src="/static/js/mif.tree.js" type="text/javascript"></script>
 <script type="text/javascript">
 window.addEvent("domready", function() {
   navparams = new Hash({
diff --git a/templates/nlayout.html b/templates/nlayout.html
index ad3092f79..5a75f72e4 100644
--- a/templates/nlayout.html
+++ b/templates/nlayout.html
@@ -11,7 +11,6 @@
   <link rel="stylesheet" type="text/css" href="/static/stylesheets/SqueezeBox.css" />
   <script src="/static/js/mootools.js" type="text/javascript"></script>
   <script src="/static/js/mootools-more.js" type="text/javascript"></script>
-  <script src="/static/js/drag.group.js" type="text/javascript"></script>
   <script src="/static/js/SqueezeBox.js" type="text/javascript"></script>
   <script src="/static/js/infobox.js" type="text/javascript"></script>
   <script src="/static/js/common.js" type="text/javascript"></script>