diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ebade551..11075beab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -269,6 +269,7 @@ generate_export_header(kmailprivate BASE_NAME kmail)
 
 target_link_libraries(kmailprivate
    PRIVATE
+    KF5::Gravatar
     KF5::Mime
     KF5::AkonadiCore
     KF5::AkonadiPrivate
diff --git a/configuredialog/configureappearancepage.cpp b/configuredialog/configureappearancepage.cpp
index cd28c2c75..0ac9b959c 100644
--- a/configuredialog/configureappearancepage.cpp
+++ b/configuredialog/configureappearancepage.cpp
@@ -77,7 +77,7 @@ using KMime::DateFormatter;
 #include <QVBoxLayout>
 #include <QRadioButton>
 #include <QCheckBox>
-#include <messageviewer/gravatarconfigwidget.h>
+#include <gravatar/gravatarconfigwidget.h>
 using namespace MailCommon;
 
 QString AppearancePage::helpAnchor() const
@@ -902,8 +902,8 @@ AppearancePageReaderTab::AppearancePageReaderTab(QWidget *parent)
             this, &ConfigModuleTab::slotEmitChanged);
     topLayout->addWidget(mViewerSettings);
 
-    mGravatarConfigWidget = new MessageViewer::GravatarConfigWidget;
-    connect(mGravatarConfigWidget, &MessageViewer::GravatarConfigWidget::configChanged, this, &ConfigModuleTab::slotEmitChanged);
+    mGravatarConfigWidget = new Gravatar::GravatarConfigWidget;
+    connect(mGravatarConfigWidget, &Gravatar::GravatarConfigWidget::configChanged, this, &ConfigModuleTab::slotEmitChanged);
     topLayout->addWidget(mGravatarConfigWidget);
     topLayout->addStretch(100);   // spacer
 }
diff --git a/configuredialog/configureappearancepage.h b/configuredialog/configureappearancepage.h
index 677c378b9..f07eefe91 100644
--- a/configuredialog/configureappearancepage.h
+++ b/configuredialog/configureappearancepage.h
@@ -37,6 +37,9 @@ class QModelIndex;
 namespace MessageViewer
 {
 class ConfigureWidget;
+}
+namespace Gravatar
+{
 class GravatarConfigWidget;
 }
 
@@ -179,7 +182,7 @@ private:
 private: // data
     QCheckBox *mCloseAfterReplyOrForwardCheck;
     MessageViewer::ConfigureWidget *mViewerSettings;
-    MessageViewer::GravatarConfigWidget *mGravatarConfigWidget;
+    Gravatar::GravatarConfigWidget *mGravatarConfigWidget;
 };
 
 class AppearancePageSystemTrayTab : public ConfigModuleTab
diff --git a/kmkernel.cpp b/kmkernel.cpp
index b8d4ff618..2f9237886 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -47,6 +47,7 @@ using KMail::MailServiceImpl;
 
 #include "MessageCore/MessageCoreSettings"
 #include "messagelistsettings.h"
+#include "gravatarsettings.h"
 #include "messagelist/messagelistutil.h"
 #include "messageviewer/messageviewersettings.h"
 #include "MessageComposer/AkonadiSender"
@@ -1481,6 +1482,7 @@ void KMKernel::slotSyncConfig()
     TemplateParser::TemplateParserSettings::self()->save();
     MessageList::MessageListSettings::self()->save();
     MailCommon::MailCommonSettings::self()->save();
+    Gravatar::GravatarSettings::self()->save();
     KMailSettings::self()->save();
     KMKernel::config()->sync();
     //Laurent investigate why we need to reload them.
@@ -1491,6 +1493,7 @@ void KMKernel::slotSyncConfig()
     TemplateParser::TemplateParserSettings::self()->load();
     MessageList::MessageListSettings::self()->load();
     MailCommon::MailCommonSettings::self()->load();
+    Gravatar::GravatarSettings::self()->load();
     KMailSettings::self()->load();
     KMKernel::config()->reparseConfiguration();
 }
@@ -1616,6 +1619,8 @@ KSharedConfig::Ptr KMKernel::config()
         MailCommon::MailCommonSettings::self()->load();
         PimCommon::PimCommonSettings::self()->setSharedConfig(mySelf->mConfig);
         PimCommon::PimCommonSettings::self()->load();
+        Gravatar::GravatarSettings::self()->setSharedConfig(mySelf->mConfig);
+        Gravatar::GravatarSettings::self()->load();
     }
     return mySelf->mConfig;
 }