diff --git a/plinth/modules/email_server/templates/email_server.html b/plinth/modules/email_server/templates/email_server.html
index 7277051e2..b48bc53aa 100644
--- a/plinth/modules/email_server/templates/email_server.html
+++ b/plinth/modules/email_server/templates/email_server.html
@@ -9,6 +9,10 @@
 {% endblock %}
 
 {% block subsubmenu %}
+  <a class="btn btn-default" role="button" href="/rspamd/">
+    {% trans "Manage Spam" %}
+    <span class="fa fa-external-link"></span>
+  </a>
   <a class="btn btn-default" role="button"
      href="{% url 'email_server:my_mail' %}">
     {% trans "Setup My Home" %}
@@ -20,11 +24,6 @@
 {% endblock %}
 
 {% block extra_content %}
-  <p>
-    <a href="/rspamd/">
-      {% trans "Visit Rspamd administration interface" %}
-    </a>
-  </p>
   {% if related_diagnostics %}
     <h3>{% trans "Service Alert" %}</h3>
     <ul class="list-group">