diff --git a/extensions/stats/logparser.py b/extensions/stats/logparser.py
index a33d5b1b9..375deedf6 100755
--- a/extensions/stats/logparser.py
+++ b/extensions/stats/logparser.py
@@ -196,19 +196,23 @@ class LogParser(object):
             cur_t = self.str2Time(self.year, mo, da, ho, mi, se)
             cur_t = cur_t - cur_t % rrdstep
 
-            m = re.search("(\w{10}): from=<(.*)>, size=(\d+)", log)
+            m = re.search("(\w{10}): message-id=<([^>]*)>", log)
+            if m:
+                self.workdict[m.group(1)] = {'from' : m.group(2), 'size' : 0}
+                continue
+
+            m = re.search("(\w{10}): from=<([^>]*)>, size=(\d+)", log)
             if m:
                 self.workdict[m.group(1)] = {'from' : m.group(2),
                                              'size' : string.atoi(m.group(3))}
                 continue
 
-            m = re.search("(\w{10}): to=<(.*)>.*status=(\S+)", log)
+            m = re.search("(\w{10}): to=<([^>]*)>.*status=(\S+)", log)
             if m:
                 if not self.workdict.has_key(m.group(1)):
-                    print "Inconsistent mail, skipping"
+                    print "Inconsistent mail (%s: %s), skipping" % (m.group(1), m.group(2))
                     continue
                 if not m.group(3) in variables:
-                    del self.workdict[m.group(1)]
                     print "Unsupported status %s, skipping" % m.group(3)
                     continue
                 addrfrom = re.match("([^@]+)@(.+)", self.workdict[m.group(1)]['from'])
diff --git a/templates/layout.html b/templates/layout.html
index 2ca17c4e8..5b14ed468 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -14,7 +14,7 @@
   <script src="/static/js/SqueezeBox.js" type="text/javascript"></script>
   <script src="/static/js/common.js" type="text/javascript"></script>
   {% url django.views.i18n.javascript_catalog as catalog_url %}
-  <script type="text/javascript" src="/jsi18n/"></script>
+  <script type="text/javascript" src="{{ catalog_url }}"></script>
   {%block html_head %}{% endblock %}
 </head>
 
diff --git a/templates/layout_simple.html b/templates/layout_simple.html
index dfdb33a71..a8c47ed08 100644
--- a/templates/layout_simple.html
+++ b/templates/layout_simple.html
@@ -10,7 +10,7 @@
   <script src="/static/js/mootools-more.js" type="text/javascript"></script>
   <script src="/static/js/SqueezeBox.js" type="text/javascript"></script>
   {% url django.views.i18n.javascript_catalog as catalog_url %}
-  <script type="text/javascript" src="/jsi18n/"></script>
+  <script type="text/javascript" src="{{ catalog_url }}"></script>
   {%block html_head %}{% endblock %}
 </head>