diff --git a/modoboa/extensions/amavis/templatetags/amavis_tags.py b/modoboa/extensions/amavis/templatetags/amavis_tags.py
index 018fed33b..9426a7897 100644
--- a/modoboa/extensions/amavis/templatetags/amavis_tags.py
+++ b/modoboa/extensions/amavis/templatetags/amavis_tags.py
@@ -11,6 +11,11 @@ register = template.Library()
 @register.simple_tag
 def viewm_menu(mail_id, rcpt):
     entries = [
+        {"name": "back",
+                 "url": "javascript:history.go(-2);",
+                 "img": "glyphicon glyphicon-arrow-left",
+                 "class": "btn-primary",
+                 "label": _("Back")},
         {"name": "release",
          "img": "glyphicon glyphicon-ok",
          "class": "btn-success",
@@ -24,6 +29,7 @@ def viewm_menu(mail_id, rcpt):
          + ("?rcpt=%s" % rcpt if rcpt else ""),
          "label": _("Delete")},
         {"name": "headers",
+         "class": "btn-default",
          "url": reverse('modoboa.extensions.amavis.views.viewheaders', args=[mail_id]),
          "label": _("View full headers")},
     ]
diff --git a/modoboa/extensions/webmail/templatetags/webmail_tags.py b/modoboa/extensions/webmail/templatetags/webmail_tags.py
index 6df6cd81d..84184b248 100644
--- a/modoboa/extensions/webmail/templatetags/webmail_tags.py
+++ b/modoboa/extensions/webmail/templatetags/webmail_tags.py
@@ -14,6 +14,11 @@ register = template.Library()
 @register.simple_tag
 def viewmail_menu(selection, folder, user, mail_id=None):
     entries = [
+        {"name": "back",
+             "url": "javascript:history.go(-2);",
+             "img": "glyphicon glyphicon-arrow-left",
+             "class": "btn-primary",
+             "label": _("Back")},
         {"name": "reply",
          "url": "action=reply&mbox=%s&mailid=%s" % (folder, mail_id),
          "img": "glyphicon glyphicon-share",
@@ -64,7 +69,7 @@ def compose_menu(selection, backurl, user):
         {"name": "back",
          "url": "javascript:history.go(-2);",
          "img": "glyphicon glyphicon-arrow-left",
-         "class": "btn-default",
+         "class": "btn-primary",
          "label": _("Back")},
         {"name": "sendmail",
          "url": "",
@@ -105,7 +110,7 @@ def listmailbox_menu(selection, folder, user):
          },
         {"name": "actions",
          "label": _("Actions"),
-         "class": "btn",
+         "class": "btn btn-default",
          "menu": [
              {"name": "compress",
               "label": _("Compress folder"),