diff --git a/modoboa/templates/404.html b/modoboa/templates/404.html
index 78aef1dae..a0a5ba664 100644
--- a/modoboa/templates/404.html
+++ b/modoboa/templates/404.html
@@ -1,4 +1,7 @@
 {% extends "layout_simple.html" %}{% load i18n %}
 {% block content %}
-<div class="alert alert-info">{% trans "The requested page does not exist." %}</div>
+<div class="alert alert-info">
+  <h4>{% trans "Sorry" %}</h4>
+  <p>{% trans "The requested page does not exist." %}</p>
+</div>
 {% endblock %}
diff --git a/modoboa/templates/500.html b/modoboa/templates/500.html
index 084fb687b..4864a78fb 100644
--- a/modoboa/templates/500.html
+++ b/modoboa/templates/500.html
@@ -1,4 +1,7 @@
 {% extends "layout_simple.html" %}{% load i18n %}
 {% block content %}
-<div class="alert alert-error">{% trans "An internal error occured." %}</div>
+<div class="alert alert-error">
+  <h4>{% trans "Sorry" %}</h4>
+  <p>{% trans "An internal error occured." %}</p>
+</div>
 {% endblock %}
diff --git a/modoboa/templates/layout_simple.html b/modoboa/templates/layout_simple.html
index fba149820..02fb8a925 100644
--- a/modoboa/templates/layout_simple.html
+++ b/modoboa/templates/layout_simple.html
@@ -10,6 +10,11 @@
     <script src="{{ STATIC_URL }}js/bootstrap-datepicker.js" type="text/javascript"></script>
     {% url django.views.i18n.javascript_catalog as catalog_url %}
     <script type="text/javascript" src="{{ catalog_url }}"></script>
+    <style>
+      body {
+          padding-top: 60px;
+      }
+    </style>
   </head>
 
   <body>