diff --git a/messageviewer/src/header/grantleeheaderstyle.cpp b/messageviewer/src/header/grantleeheaderstyle.cpp
index 71e8adbe..cc9bfed5 100644
--- a/messageviewer/src/header/grantleeheaderstyle.cpp
+++ b/messageviewer/src/header/grantleeheaderstyle.cpp
@@ -1,79 +1,73 @@
 /*
    Copyright (C) 2013-2018 Laurent Montel <montel@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "grantleeheaderstyle.h"
 #include "header/grantleeheaderformatter.h"
 #include "header/headerstrategy.h"
 #include "grantleetheme/grantleetheme.h"
 
 #include <kmime/kmime_message.h>
 
 using namespace MessageViewer;
 class MessageViewer::GrantleeHeaderStylePrivate
 {
 public:
     GrantleeHeaderStylePrivate()
     {
         mGrantleeFormatter = new GrantleeHeaderFormatter;
     }
 
     ~GrantleeHeaderStylePrivate()
     {
         delete mGrantleeFormatter;
     }
 
     GrantleeHeaderFormatter *mGrantleeFormatter = nullptr;
-    bool mShowMailAction = true;
 };
 
 GrantleeHeaderStyle::GrantleeHeaderStyle()
     : HeaderStyle()
     , d(new MessageViewer::GrantleeHeaderStylePrivate)
 {
 }
 
 GrantleeHeaderStyle::~GrantleeHeaderStyle()
 {
     delete d;
 }
 
 const char *GrantleeHeaderStyle::name() const
 {
     return "grantlee";
 }
 
 QString GrantleeHeaderStyle::format(KMime::Message *message) const
 {
     if (!message) {
         return QString();
     }
 
     GrantleeHeaderFormatter::GrantleeHeaderFormatterSettings settings;
     settings.isPrinting = isPrinting();
     settings.theme = theme();
     settings.style = this;
     settings.message = message;
     settings.showEmoticons = showEmoticons();
     return d->mGrantleeFormatter->toHtml(settings);
 }
-
-bool GrantleeHeaderStyle::showMailAction() const
-{
-    return d->mShowMailAction;
-}
diff --git a/messageviewer/src/header/grantleeheaderstyle.h b/messageviewer/src/header/grantleeheaderstyle.h
index df977d08..37100cbf 100644
--- a/messageviewer/src/header/grantleeheaderstyle.h
+++ b/messageviewer/src/header/grantleeheaderstyle.h
@@ -1,44 +1,41 @@
 /*
    Copyright (C) 2013-2018 Laurent Montel <montel@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #ifndef GRANTLEEHEADERSTYLE_H
 #define GRANTLEEHEADERSTYLE_H
 
 #include "messageviewer/headerstyle.h"
 
 namespace MessageViewer {
 class GrantleeHeaderStylePrivate;
 class MESSAGEVIEWER_EXPORT GrantleeHeaderStyle : public HeaderStyle
 {
 public:
     GrantleeHeaderStyle();
     ~GrantleeHeaderStyle() override;
 
 public:
     const char *name() const override;
 
     QString format(KMime::Message *message) const override;
-
-    bool showMailAction() const;
-    void setShowMailAction(bool showAction);
 private:
     GrantleeHeaderStylePrivate *const d;
 };
 }
 #endif // GRANTLEEHEADERSTYLE_H
diff --git a/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/header.html b/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/header.html
index aa19d7b9..b6a021e0 100644
--- a/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/header.html
+++ b/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/theme/5.2/header.html
@@ -1,90 +1,71 @@
 <link href="{{ header.absoluteThemePath }}/style.css" rel="stylesheet" type="text/css" />
 <div id="kmailPage">
 <div id="headerbox" dir="ltr">
-        {% if header.showMailAction %}
-        {% if header.screenmode %}
-        <div class="actiontable">
-          <div class="actionrowtable">
-              <div class="theactioncell"> {{ header.newmessageaction|safe }} </div>
-              <div class="theactioncell"> {{ header.printpreviewmessageaction|safe }} </div>
-              <div class="theactioncell"> {{ header.printmessageaction|safe }} </div>
-              <div class="theactioncell theactionbigcell"></div>
-              <div class="theactioncell"> {{ header.replyaction|safe }} </div>
-              <div class="theactioncell"> {{ header.replyallaction|safe }} </div>
-              <div class="theactioncell"> {{ header.forwardaction|safe }} </div>
-              {% if header.readOnlyMessage %}
-              {% else %}
-              <div class="theactioncell"> {{ header.trashaction|safe }} </div>
-              {% endif %}
-           </div>
-        </div>
-        {% endif %}
-        {% endif %}
         <div id="subject" dir="{{ header.subjectDir }}">{{ header.subject|safe }}</div>
 	<div id="photo">
 		{% if header.photourl %}
 		<img src="{{ header.photourl }}" width="{{ header.photowidth }}" height="{{ header.photoheight }}" />
 		{% else %}
 		<img src="{{ header.absoluteThemePath }}/photo.svg" width="{{ header.photowidth }}" height="{{ header.photoheight }}" />
 		{% endif %}
 	</div>
 	<div class="table">
 		<div class="row">
 			<div class="headerleft">{{ header.fromi18n }}</div>
 			<div class="headerright">
 				{{ header.from|safe }}
 				{% if header.resentfrom %}
 				{{ header.resentfromi18n }}: {{ header.resentfrom|safe }}
 				{% endif %}
 				{% if header.vcardname %}
 				<a href="{{ header.vcardname|safe }}">{{ header.vcardi18n }}</a>
 				{% endif %}
 				{% if header.organization %}
 				({{ header.organization|safe }})
 				{% endif %}
 			</div>
 		</div>
                 {% if header.to %}
 		<div class="row">
 			<div class="headerleft">{{ header.toi18n }}</div>
 			<div class="headerright">{{ header.toExpandable|safe }}</div>
 		</div>
                 {% endif %}
 		{% if header.cc %}
 		<div class="row">
 			<div class="headerleft">{{ header.cci18n }}</div>
 			<div class="headerright">{{ header.ccExpandable|safe }}</div>
 		</div>
 		{% endif %}
 		{% if header.bcc %}
 		<div class="row">
 			<div class="headerleft">{{ header.bcci18n }}</div>
 			<div class="headerright">{{ header.bcc|safe }}</div>
 		</div>
 		{% endif %}
 		{% if header.sender %}
 		<div class="row">
 			<div class="headerleft">{{ header.senderi18n }}</div>
 			<div class="headerright">{{ header.sender|safe }}</div>
 		</div>
 		{% endif %}
 		{% if header.listid %}
 		<div class="row">
 			<div class="headerleft">{{ header.listidi18n }}</div>
 			<div class="headerright">{{ header.listid }}</div>
 		</div>
 		{% endif %}
 		<div class="row">
 			<div class="headerleft">{{ header.datei18n }}</div>
 			<div class="headerrightdate" dir="{{ header.applicationDir }}">{{ header.dateshort }}</div>
 		</div>
 		{% if header.spamHTML %}
 		<div class="row">
 			<div class="headerleft">{{ header.spamstatusi18n }}</div>
 			<div class="headerrightdate">{{ header.spamHTML|safe }}</div>
 		</div>
 		{% endif %}
 	</div>
 	<div>{{ header.attachmentHtml|safe }}</div>
 </div>
 <div id="kmailContent">