diff --git a/modoboa/lib/middleware.py b/modoboa/lib/middleware.py
index 456e2f121..365d12f68 100644
--- a/modoboa/lib/middleware.py
+++ b/modoboa/lib/middleware.py
@@ -37,7 +37,7 @@ class CommonExceptionCatcher(object):
                 unicode(exception), status=exception.http_code
             )
         return _render_error(
-            request, user_context=dict(error=str(exception))
+            request, user_context=dict(error=unicode(exception))
         )
 
 
diff --git a/modoboa/templates/common/viewmail.html b/modoboa/templates/common/viewmail.html
index 7156be906..d5df9f6ef 100644
--- a/modoboa/templates/common/viewmail.html
+++ b/modoboa/templates/common/viewmail.html
@@ -6,9 +6,11 @@
     <link rel="stylesheet" type="text/css" href="{% static 'css/viewmail.css' %}" />
   </head>
   <body>
-    <div id="table-container">
-      {{ headers }}
-    </div>
+    {% if headers %}
+      <div id="table-container">
+        {{ headers }}
+      </div>
+    {% endif %}
     {{ mailbody|safe }}
   </body>
 </html>
diff --git a/modoboa/urls.py b/modoboa/urls.py
index 2db45e2e1..5d0d350f8 100644
--- a/modoboa/urls.py
+++ b/modoboa/urls.py
@@ -37,7 +37,7 @@ if extra_routes:
 
 # API urls
 urlpatterns += [
-    url("^docs/api/", include_docs_urls(title=API_TITLE)),
+    url("^docs/api/", include_docs_urls(title=API_TITLE, public=False)),
     url("^api/v1/", include("modoboa.urls_api", namespace="api")),
 ]