diff --git a/admin/views.py b/admin/views.py
index 60d78787a..efcbd14e9 100644
--- a/admin/views.py
+++ b/admin/views.py
@@ -167,6 +167,7 @@ def newmailbox(request, dom_id=None):
                     
                     events.raiseEvent("CreateMailbox", mbox=mb)
 
+                    request.user.message_set.create(message=_("Mailbox created."))
                     ctx = _ctx_ok(reverse(admin.views.mailboxes, args=[domain.id]))
                     return HttpResponse(simplejson.dumps(ctx), 
                                         mimetype="application/json")
diff --git a/extensions/amavis_quarantine/templates/index.html b/extensions/amavis_quarantine/templates/index.html
index bbd88b7a9..635b40edb 100644
--- a/extensions/amavis_quarantine/templates/index.html
+++ b/extensions/amavis_quarantine/templates/index.html
@@ -148,23 +148,10 @@ window.addEvent("domready", function() {
 });
 </script>
 {% endblock %}
-
-{% block content %}
-<div class="header">
-  <h1>{% trans "Quarantine" %}</h1>
-  {% if messages %}
-  <div id="infos">
-  {% for m in messages %}
-  {{ m }}
-  {% endfor %}
-  </div>
-  {% endif %}
-</div>
-
-<div id="menubar" class="menu2">
+{% block middletitle %}{% trans "Quarantine" %}{% endblock %}
+{% block menu %}
   {% quar_menu "" perms %}
-
-   <div id="searchbox">
+  <div id="searchbox">
     <img src="/static/pics/search.png" id="searchopts" />
     <input type="text" name="searchfield" id="searchfield" value="{% trans "Search..." %}" />
     <div id="searchparams">
@@ -173,8 +160,8 @@ window.addEvent("domready", function() {
       <input type="radio" name="scriteria" value="from_addr,subject">{% trans "Both" %}<br/>
     </div>
   </div>
-</div>
-
+{% endblock %}
+{% block content %}
 <div id="form-container">
 {% url extensions.amavis_quarantine.main.process as actionurl %}
 <form method="POST" action="{{ actionurl }}" id="quarlistingform">
@@ -185,4 +172,4 @@ window.addEvent("domready", function() {
 </div>
 </form>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/extensions/amavis_quarantine/templates/viewmail.html b/extensions/amavis_quarantine/templates/viewmail.html
index 8de14a360..a8f174d10 100644
--- a/extensions/amavis_quarantine/templates/viewmail.html
+++ b/extensions/amavis_quarantine/templates/viewmail.html
@@ -29,12 +29,12 @@ td.left {
 }
 </style>
 {% endblock %}
-{% block content %}
-<div class="menu2" id="menu2">
+{% block middletitle %}{% trans "Mail content" %}{% endblock %}
+{% block menu %}
   {% load amextras %}
   {% viewm_menu "" mail_id page_id perms %}
-</div>
-
+{% endblock %}
+{% block content %}
 <div id="table-container">
 <table border="0">
   <tr>
@@ -51,4 +51,4 @@ td.left {
 {% url extensions.amavis_quarantine.main.getmailcontent mail_id as geturl %}
 <iframe id="mailcontent" src="{{ geturl }}?mode={{ params.mode }}&links={{ params.links }}"></iframe>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/static/js/common.js b/static/js/common.js
index 48b014a44..07915083c 100644
--- a/static/js/common.js
+++ b/static/js/common.js
@@ -1,6 +1,6 @@
 window.addEvent('domready', function(){
-    if ($('menu2')) {
-	$('menu2').getElements('li.dropdown').each( function( elem ){
+    if ($('menubar')) {
+	$('menubar').getElements('li.dropdown').each( function( elem ){
 	    var list = elem.getElement('ul.links');
 	    var myFx = new Fx.Slide(list).hide();
 	    elem.addEvents({
diff --git a/static/stylesheets/basic.css b/static/stylesheets/basic.css
index 120b1f862..8e6104166 100644
--- a/static/stylesheets/basic.css
+++ b/static/stylesheets/basic.css
@@ -144,7 +144,6 @@ body {
 #menubar {
     margin-left: 20px;
     display: table;
-    margin-bottom: 15px;
     width: 730px;
     position: absolute;
 }
@@ -153,14 +152,8 @@ body {
     margin-top: 60px;
 }
 
-#menu2 { 
-    position: absolute;
-    height: 30px;
-    clear: both;
-}
-
 #table-container { 
-    margin-top: 30px;
+    margin-top: 60px;
 }
 
 .menu2 { 
@@ -288,7 +281,7 @@ body {
 
 #domcontent {
     margin: 0 auto;
-    margin-top: 60px;
+    margin-top: 25px;
     margin-bottom: 10px;
     width: 90%;
 }
diff --git a/templates/admin/domain_header.html b/templates/admin/domain_header.html
index 7dae4dd19..19bb0bfeb 100644
--- a/templates/admin/domain_header.html
+++ b/templates/admin/domain_header.html
@@ -1,19 +1,12 @@
 {% extends "layout.html" %}
+{% load i18n %}
 {% block html_head %}
 <script src="/static/js/common.js" type="text/javascript"></script>
 <script src="/static/js/domains.js" type="text/javascript"></script>
 {% endblock %}
+{% block middletitle %}{% trans "Domain" %} {{ domain.name }}{% endblock %}
 {% block content %}
-{% load i18n %}
-<div class="header">
-  <h1>{% trans "Domain" %} {{ domain.name }}</h1>
-</div>
-
-<div id="menubar" class="menu2">
-  {% block menu %}{% endblock %}
-</div>
-
-<div id="domcontent">
+<div id="subcontent">
 {% block domcontent %}{% endblock %}
 </div>
 {% endblock %}
diff --git a/templates/admin/domains.html b/templates/admin/domains.html
index 03ca98f72..27111c54c 100644
--- a/templates/admin/domains.html
+++ b/templates/admin/domains.html
@@ -1,13 +1,10 @@
 {% extends "layout.html" %}
+{% load i18n %}
 {% block html_head %}
 <script src="/static/js/domains.js" type="text/javascript"></script>
 {% endblock %}
+{% block middletitle %}{% trans "Available domains" %}{% endblock %}
 {% block content %}
-{% load i18n %}
-<div class="header">
-  <h1>{% trans "Available domains" %}</h1>
-</div>
-
 <div id="domcontent">
   {% if not domains %}
   {% trans "No domain defined." %}
diff --git a/templates/admin/mailboxes.html b/templates/admin/mailboxes.html
index 28d8c28ab..6ae705aec 100644
--- a/templates/admin/mailboxes.html
+++ b/templates/admin/mailboxes.html
@@ -7,16 +7,6 @@
 {% endblock %}
 {% block domcontent %}
 {% load i18n %}
-{% if messages %}
-<div class="error">
-<ul>
-  {% for msg in messages %}
-  <li>{{ msg }}</li>
-  {% endfor %}
-</ul>
-</div>
-{% endif %}
-
 {% if not mailboxes %}
 <p>{% trans "No mailbox defined." %}</p>
 {% else %}
diff --git a/templates/admin/settings_header.html b/templates/admin/settings_header.html
index 5abaeb0b6..9748e53fd 100644
--- a/templates/admin/settings_header.html
+++ b/templates/admin/settings_header.html
@@ -1,24 +1,10 @@
 {% extends "layout.html" %}
+{% load i18n %}
 {% block html_head %}
 <script src="/static/js/settings.js" type="text/javascript"></script>
 {% endblock %}
+{% block middletitle %}{% trans "Settings" %}{% endblock %}
 {% block content %}
-{% load i18n %}
-<div class="header">
-  <h1>{% trans "Settings" %}</h1>
-  {% if messages %}
-  <div id="infos">
-  {% for m in messages %}
-  {{ m }}
-  {% endfor %}
-  </div>
-  {% endif %}
-</div>
-
-<div id="menubar" class="menu2">
-  {% block menu %}{% endblock %}
-</div>
-
 <div id="setcontent">
 {% block setcontent %}{% endblock %}
 </div>
diff --git a/templates/layout.html b/templates/layout.html
index 5e3335a96..1cc2f4262 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -93,6 +93,17 @@
     {% else %}
     <div id="content2">
     {% endif %}
+      <div class="header">
+        <h1>{% block middletitle %}{% endblock %}</h1>
+        {% if messages %}
+        <div id="infos">
+        {% for m in messages %}{{ m }}{% endfor %}
+        </div>
+        {% endif %}
+      </div>
+      <div id="menubar" class="menu2">
+      {% block menu %}{% endblock %}
+      </div>
       {% block content %}{% endblock %}
     </div>
   </div>
diff --git a/templates/main/header.html b/templates/main/header.html
index 85b2b15bd..37d898d43 100644
--- a/templates/main/header.html
+++ b/templates/main/header.html
@@ -1,24 +1,10 @@
 {% extends "layout.html" %}
+{% load i18n %}
 {% block html_head %}
 <script src="/static/js/main.js" type="text/javascript"></script>
 {% endblock %}
+{% block middletitle %}{% trans "General" %}{% endblock %}
 {% block content %}
-{% load i18n %}
-<div class="header">
-  <h1>{% trans "General" %}</h1>
-  {% if messages %}
-  <div id="infos">
-  {% for m in messages %}
-  {{ m }}
-  {% endfor %}
-  </div>
-  {% endif %}
-</div>
-
-<div id="menubar" class="menu2">
-  {% block menu %}{% endblock %}
-</div>
-
 <div id="subcontent">
 {% block subcontent %}{% endblock %}
 </div>