diff --git a/messageviewer/src/header/grantleeheaderformatter.cpp b/messageviewer/src/header/grantleeheaderformatter.cpp
--- a/messageviewer/src/header/grantleeheaderformatter.cpp
+++ b/messageviewer/src/header/grantleeheaderformatter.cpp
@@ -45,7 +45,7 @@
 Q_DECLARE_METATYPE(const KMime::Headers::Generics::AddressList *)
 Q_DECLARE_METATYPE(const KMime::Headers::Generics::MailboxList *)
 Q_DECLARE_METATYPE(QSharedPointer<KMime::Headers::Generics::MailboxList>)
-Q_DECLARE_METATYPE(const KMime::Headers::Date *)
+Q_DECLARE_METATYPE(QDateTime)
 
 // Read-only introspection of KMime::Headers::Generics::AddressList object.
 namespace Grantlee {
@@ -121,15 +121,15 @@
 
 namespace Grantlee {
 template<>
-inline QVariant TypeAccessor<const KMime::Headers::Date *>::lookUp(const KMime::Headers::Date *const object, const QString &property)
+inline QVariant TypeAccessor<QDateTime &>::lookUp(QDateTime const &object, const QString &property)
 {
     MessageViewer::HeaderStyleUtil::HeaderStyleUtilDateFormat dateFormat;
     if (property == QStringLiteral("str")) {
-        return HeaderStyleUtil::dateStr(object->dateTime());
+        return HeaderStyleUtil::dateStr(object);
     } else if (property == QStringLiteral("short")) {
         dateFormat = MessageViewer::HeaderStyleUtil::ShortDate;
     } else if (property == QStringLiteral("long")) {
-        dateFormat = MessageViewer::HeaderStyleUtil::CustomDate;
+        dateFormat = MessageViewer::HeaderStyleUtil::LongDate;
     } else if (property == QStringLiteral("fancylong")) {
         dateFormat = MessageViewer::HeaderStyleUtil::FancyLongDate;
     } else if (property == QStringLiteral("fancyshort")) {
@@ -152,7 +152,7 @@
         Grantlee::registerMetaType<const KMime::Headers::Generics::AddressList *>();
         Grantlee::registerMetaType<const KMime::Headers::Generics::MailboxList *>();
         Grantlee::registerMetaType<QSharedPointer<KMime::Headers::Generics::MailboxList> >();
-        Grantlee::registerMetaType<const KMime::Headers::Date *>();
+        Grantlee::registerMetaType<QDateTime>();
         iconSize = KIconLoader::global()->currentSize(KIconLoader::Toolbar);
         engine = new Grantlee::Engine;
         templateLoader = QSharedPointer<Grantlee::FileSystemTemplateLoader>(
@@ -287,8 +287,7 @@
     {
         const auto value = nodeHelper->dateHeader(message);
         headerObject.insert(QStringLiteral("datei18n"), i18n("Date:"));
-        // TODO: rewrite that QDateTime is expected in GRANTLEE
-        headerObject.insert(QStringLiteral("date"), QVariant::fromValue(static_cast<const KMime::Headers::Date *>(message->date())));
+        headerObject.insert(QStringLiteral("date"), QVariant::fromValue(message->date()->dateTime()));
     }
 
     if (nodeHelper->hasMailHeader("Resent-From", message)) {
diff --git a/messageviewer/src/header/headerstyle_util.h b/messageviewer/src/header/headerstyle_util.h
--- a/messageviewer/src/header/headerstyle_util.h
+++ b/messageviewer/src/header/headerstyle_util.h
@@ -63,7 +63,7 @@
 
     static Q_REQUIRED_RESULT QString strToHtml(const QString &str, KTextToHTML::Options flags = KTextToHTML::PreserveSpaces);
     static Q_REQUIRED_RESULT QString dateString(KMime::Message *message, HeaderStyleUtilDateFormat dateFormat);
-    static Q_REQUIRED_RESULT QString dateString(const KMime::Headers::Date *date, HeaderStyleUtilDateFormat dateFormat);
+    static Q_REQUIRED_RESULT QString dateString(const QDateTime &date, HeaderStyleUtilDateFormat dateFormat);
 
     Q_REQUIRED_RESULT QString subjectString(KMime::Message *message, KTextToHTML::Options flags = KTextToHTML::PreserveSpaces) const;
 
diff --git a/messageviewer/src/header/headerstyle_util.cpp b/messageviewer/src/header/headerstyle_util.cpp
--- a/messageviewer/src/header/headerstyle_util.cpp
+++ b/messageviewer/src/header/headerstyle_util.cpp
@@ -64,12 +64,11 @@
 // Prepare the date string
 QString HeaderStyleUtil::dateString(KMime::Message *message, HeaderStyleUtilDateFormat dateFormat)
 {
-    return dateString(message->date(), dateFormat);
+    return dateString(message->date()->dateTime(), dateFormat);
 }
 
-QString HeaderStyleUtil::dateString(const KMime::Headers::Date *date, HeaderStyleUtilDateFormat dateFormat)
+QString HeaderStyleUtil::dateString(const QDateTime &dateTime, HeaderStyleUtilDateFormat dateFormat)
 {
-    const QDateTime dateTime = date->dateTime();
     if (!dateTime.isValid()) {
         qCDebug(MESSAGEVIEWER_LOG) << "Unable to parse date";
         return i18nc("Unknown date", "Unknown");