diff --git a/extensions/amavis_quarantine/static/css/quarantine.css b/extensions/amavis_quarantine/static/css/quarantine.css
index 3aac8ced5..224659aa8 100644
--- a/extensions/amavis_quarantine/static/css/quarantine.css
+++ b/extensions/amavis_quarantine/static/css/quarantine.css
@@ -2,6 +2,9 @@
     position: fixed;
     top: 60px;
     padding-left: 15px;
+    padding-right: 15px;
+    left: 0;
+    right: 0;
 }
 
 #listing { 
diff --git a/extensions/amavis_quarantine/templatetags/amextras.py b/extensions/amavis_quarantine/templatetags/amextras.py
index 0ddc10c6b..ef1dcc3a7 100644
--- a/extensions/amavis_quarantine/templatetags/amextras.py
+++ b/extensions/amavis_quarantine/templatetags/amextras.py
@@ -12,15 +12,6 @@ register = template.Library()
 @register.simple_tag
 def viewm_menu(user, mail_id, rcpt):
     entries = [
-        {"name" : "back",
-         "img" : "icon-arrow-left",
-         "url" : "javascript:history.go(-1);",
-         "label" : _("Back to list")},
-        {"name" : "headers",
-         "url" : reverse(amavis_quarantine.views.viewheaders, args=[mail_id]),
-         "label" : _("View full headers"),
-         "modal" : True,
-         "autowidth" : True},
         {"name" : "release",
          "img" : "icon-white icon-ok",
          "class" : "btn-success",
@@ -33,10 +24,23 @@ def viewm_menu(user, mail_id, rcpt):
          "url" : reverse(amavis_quarantine.views.delete, args=[mail_id]) \
              + ("?rcpt=%s" % rcpt if rcpt else ""),
          "label" : _("Delete")},
+        {"name" : "headers",
+         "url" : reverse(amavis_quarantine.views.viewheaders, args=[mail_id]),
+         "label" : _("View full headers"),
+         "modal" : True,
+         "autowidth" : True},
         ]
 
-    return render_to_string('common/buttons_list.html', 
-                            {"entries" : entries})
+    menu = render_to_string('common/buttons_list.html', 
+                            {"entries" : entries, "extraclasses" : "pull-left"})
+    
+    entries = [{"name" : "close",
+                "url" : "javascript:history.go(-1);",
+                "img" : "icon-remove"}]
+    menu += render_to_string('common/buttons_list.html', 
+                             {"entries" : entries, "extraclasses" : "pull-right"})
+
+    return menu
 
 @register.simple_tag
 def viewm_menu_simple(user, mail_id, rcpt, secret_id=""):
diff --git a/templates/common/buttons_list.html b/templates/common/buttons_list.html
index 38692f397..c987f62c0 100644
--- a/templates/common/buttons_list.html
+++ b/templates/common/buttons_list.html
@@ -1,5 +1,5 @@
 {% load libextras %}
-<div class="btn-toolbar">{% for entry in entries %}
+<div class="btn-toolbar {{ extraclasses }}">{% for entry in entries %}
   <div class="btn-group">{% if entry.menu %}
     <a class="btn dropdown-toggle" data-toggle="dropdown">{{ entry.label }}<span class="caret"></span></a>  
     <ul class="dropdown-menu">{% for sentry in entry.menu %}