diff --git a/autotests/gravatarconfiguresettingsdialogtest.cpp b/autotests/gravatarconfiguresettingsdialogtest.cpp
index 19a3982..841d68f 100644
--- a/autotests/gravatarconfiguresettingsdialogtest.cpp
+++ b/autotests/gravatarconfiguresettingsdialogtest.cpp
@@ -1,64 +1,60 @@
 /*
    Copyright (C) 2015-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 "gravatarconfiguresettingsdialogtest.h"
 #include "../src/widgets/gravatarconfiguresettingsdialog.h"
 #include <QCheckBox>
 #include <QLabel>
 #include <QPushButton>
 #include <KPluralHandlingSpinBox>
 #include <QTest>
 #include <KSeparator>
 
 GravatarConfigureSettingsDialogTest::GravatarConfigureSettingsDialogTest(QObject *parent)
     : QObject(parent)
 {
 }
 
 GravatarConfigureSettingsDialogTest::~GravatarConfigureSettingsDialogTest()
 {
 }
 
 void GravatarConfigureSettingsDialogTest::shouldHaveDefaultValue()
 {
     Gravatar::GravatarConfigureSettingsDialog dlg;
     QCheckBox *useDefaultImage = dlg.findChild<QCheckBox *>(QStringLiteral("usedefaultimage"));
     QVERIFY(useDefaultImage);
 
     QPushButton *clearGravatarCache = dlg.findChild<QPushButton *>(QStringLiteral("cleargravatarcachebutton"));
     QVERIFY(clearGravatarCache);
 
     QLabel *lab = dlg.findChild<QLabel *>(QStringLiteral("gravatarcachesizelabel"));
     QVERIFY(lab);
 
     KPluralHandlingSpinBox *gravatarCacheSize = dlg.findChild<KPluralHandlingSpinBox *>(QStringLiteral("gravatarcachesize"));
     QVERIFY(gravatarCacheSize);
 
-    QLabel *label = dlg.findChild<QLabel *>(QStringLiteral("labelwarning"));
-    QVERIFY(label);
-    QVERIFY(!label->text().isEmpty());
-
     KSeparator *separator = dlg.findChild<KSeparator *>(QStringLiteral("separator"));
     QVERIFY(separator);
 
     KSeparator *separator2 = dlg.findChild<KSeparator *>(QStringLiteral("separator2"));
     QVERIFY(separator2);
 }
 
 QTEST_MAIN(GravatarConfigureSettingsDialogTest)
diff --git a/src/widgets/gravatarconfiguresettingsdialog.cpp b/src/widgets/gravatarconfiguresettingsdialog.cpp
index a364f34..bc67f6e 100644
--- a/src/widgets/gravatarconfiguresettingsdialog.cpp
+++ b/src/widgets/gravatarconfiguresettingsdialog.cpp
@@ -1,119 +1,115 @@
 /*
    Copyright (C) 2015-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 "gravatarconfiguresettingsdialog.h"
 #include "misc/gravatarcache.h"
 #include "gravatarsettings.h"
 #include "PimCommon/ConfigureImmutableWidgetUtils"
 
 #include <KLocalizedString>
 #include <KPluralHandlingSpinBox>
 #include <KSeparator>
 #include <QCheckBox>
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 using namespace Gravatar;
 using namespace PimCommon::ConfigureImmutableWidgetUtils;
 
 GravatarConfigureSettingsDialog::GravatarConfigureSettingsDialog(QWidget *parent)
     : QDialog(parent)
 {
     setWindowTitle(i18n("Configure Gravatar"));
     QVBoxLayout *topLayout = new QVBoxLayout(this);
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults, this);
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
     okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &GravatarConfigureSettingsDialog::save);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &GravatarConfigureSettingsDialog::reject);
     connect(buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, this, &GravatarConfigureSettingsDialog::slotRestoreDefault);
     okButton->setDefault(true);
 
     mUseDefaultPixmap = new QCheckBox(i18n("Use Default Image"), this);
     mUseDefaultPixmap->setObjectName(QStringLiteral("usedefaultimage"));
     topLayout->addWidget(mUseDefaultPixmap);
 
-    QLabel *label = new QLabel(i18n("Libravatar will be shutdown the 1st september 2018"), this);
-    label->setObjectName(QStringLiteral("labelwarning"));
-    topLayout->addWidget(label);
-
     QHBoxLayout *cacheSizeLayout = new QHBoxLayout;
     topLayout->addLayout(cacheSizeLayout);
     QLabel *lab = new QLabel(i18n("Gravatar Cache Size:"), this);
     lab->setObjectName(QStringLiteral("gravatarcachesizelabel"));
     cacheSizeLayout->addWidget(lab);
 
     mGravatarCacheSize = new KPluralHandlingSpinBox(this);
     mGravatarCacheSize->setMinimum(1);
     mGravatarCacheSize->setMaximum(9999);
     mGravatarCacheSize->setSuffix(ki18ncp("add space before image", " image", " images"));
     mGravatarCacheSize->setObjectName(QStringLiteral("gravatarcachesize"));
     cacheSizeLayout->addWidget(mGravatarCacheSize);
     cacheSizeLayout->addStretch();
 
     KSeparator *separator = new KSeparator(this);
     separator->setObjectName(QStringLiteral("separator"));
     topLayout->addWidget(separator);
 
     QHBoxLayout *buttonLayout = new QHBoxLayout;
     topLayout->addLayout(buttonLayout);
     mClearGravatarCache = new QPushButton(i18n("Clear Gravatar Cache"), this);
     mClearGravatarCache->setObjectName(QStringLiteral("cleargravatarcachebutton"));
     buttonLayout->addWidget(mClearGravatarCache);
     buttonLayout->addStretch();
 
     separator = new KSeparator(this);
     separator->setObjectName(QStringLiteral("separator2"));
     topLayout->addWidget(separator);
 
     connect(mClearGravatarCache, &QAbstractButton::clicked, this, &GravatarConfigureSettingsDialog::slotClearGravatarCache);
     topLayout->addWidget(buttonBox);
     load();
 }
 
 GravatarConfigureSettingsDialog::~GravatarConfigureSettingsDialog()
 {
 }
 
 void GravatarConfigureSettingsDialog::slotRestoreDefault()
 {
     const bool bUseDefaults = Gravatar::GravatarSettings::self()->useDefaults(true);
     load();
     Gravatar::GravatarSettings::self()->useDefaults(bUseDefaults);
 }
 
 void GravatarConfigureSettingsDialog::save()
 {
     saveCheckBox(mUseDefaultPixmap, Gravatar::GravatarSettings::self()->gravatarUseDefaultImageItem());
     saveSpinBox(mGravatarCacheSize, Gravatar::GravatarSettings::self()->gravatarCacheSizeItem());
     accept();
 }
 
 void GravatarConfigureSettingsDialog::load()
 {
     loadWidget(mUseDefaultPixmap, Gravatar::GravatarSettings::self()->gravatarUseDefaultImageItem());
     loadWidget(mGravatarCacheSize, Gravatar::GravatarSettings::self()->gravatarCacheSizeItem());
 }
 
 void GravatarConfigureSettingsDialog::slotClearGravatarCache()
 {
     Gravatar::GravatarCache::self()->clearAllCache();
 }