diff --git a/devel/notmuch-web/nmweb.py b/devel/notmuch-web/nmweb.py
index 7b555c62..b0d4d5cd 100755
--- a/devel/notmuch-web/nmweb.py
+++ b/devel/notmuch-web/nmweb.py
@@ -125,7 +125,7 @@ def mailto_addrs(msg,header_name):
     return ''
 
   frm = email.utils.getaddresses([hdr])
-  return ','.join(['<a href="mailto:%s">%s</a> ' % ((l, p) if p else (l, l)) for (p, l) in frm])
+  return ', '.join(['<a href="mailto:%s">%s</a>' % ((l, p) if p else (l, l)) for (p, l) in frm])
 env.globals['mailto_addrs'] = mailto_addrs
 
 def link_msg(msg):
diff --git a/devel/notmuch-web/templates/show.html b/devel/notmuch-web/templates/show.html
index 98d36acc..690f5464 100644
--- a/devel/notmuch-web/templates/show.html
+++ b/devel/notmuch-web/templates/show.html
@@ -3,10 +3,10 @@
 {% set headers = ['Subject', 'Date'] %}
 {% set addr_headers = ['To', 'Cc', 'From'] %}
 {% for header in headers: %}
-<p><b>{{header}}:</b>{{m.header(header)|e}}</p>
+<p><b>{{header}}:</b> {{m.header(header)|e}}</p>
 {% endfor %}
 {% for header in addr_headers: %}
-<p><b>{{header}}:</b>{{mailto_addrs(m,header)|safe}}</p>
+<p><b>{{header}}:</b> {{mailto_addrs(m,header)|safe}}</p>
 {% endfor %}
 <hr>
 {% for part in format_message(m,mid): %}{{ part|safe }}{% endfor %}