diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -517,7 +517,7 @@
     readFolderConfig();
     if (mMsgView) {
         mMsgView->setDisplayFormatMessageOverwrite(mFolderDisplayFormatPreference);
-        mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPreference);
+        mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPreference);
     }
 
     if (!mCurrentFolderSettings->isValid() && (mMessagePane->count() < 2)) {
@@ -1568,7 +1568,7 @@
     mFolderHtmlLoadExtPreference = !mFolderHtmlLoadExtPreference;
 
     if (mMsgView) {
-        mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPreference);
+        mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPreference);
         mMsgView->update(true);
     }
 }
@@ -4424,7 +4424,7 @@
     mMsgView->setMessage(copyItem);
     // reset HTML override to the folder setting
     mMsgView->setDisplayFormatMessageOverwrite(mFolderDisplayFormatPreference);
-    mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPreference);
+    mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPreference);
     mMsgView->setDecryptMessageOverwrite(false);
     mMsgActions->setCurrentMessage(copyItem);
 }
diff --git a/src/kmreadermainwin.h b/src/kmreadermainwin.h
--- a/src/kmreadermainwin.h
+++ b/src/kmreadermainwin.h
@@ -33,7 +33,7 @@
     Q_OBJECT
 
 public:
-    KMReaderMainWin(MessageViewer::Viewer::DisplayFormatMessage format, bool htmlLoadExtOverride, const QString &name = QString());
+    KMReaderMainWin(MessageViewer::Viewer::DisplayFormatMessage format, bool htmlLoadExtDefault, const QString &name = QString());
     explicit KMReaderMainWin(const QString &name = QString());
     KMReaderMainWin(KMime::Content *aMsgPart, MessageViewer::Viewer::DisplayFormatMessage format, const QString &encoding, const QString &name = QString());
     ~KMReaderMainWin() override;
diff --git a/src/kmreadermainwin.cpp b/src/kmreadermainwin.cpp
--- a/src/kmreadermainwin.cpp
+++ b/src/kmreadermainwin.cpp
@@ -70,12 +70,12 @@
 
 using namespace MailCommon;
 
-KMReaderMainWin::KMReaderMainWin(MessageViewer::Viewer::DisplayFormatMessage format, bool htmlLoadExtOverride, const QString &name)
+KMReaderMainWin::KMReaderMainWin(MessageViewer::Viewer::DisplayFormatMessage format, bool htmlLoadExtDefault, const QString &name)
     : KMail::SecondaryWindow(!name.isEmpty() ? name : QStringLiteral("readerwindow#"))
 {
     mReaderWin = new KMReaderWin(this, this, actionCollection());
     mReaderWin->setDisplayFormatMessageOverwrite(format);
-    mReaderWin->setHtmlLoadExtOverride(htmlLoadExtOverride);
+    mReaderWin->setHtmlLoadExtDefault(htmlLoadExtDefault);
     mReaderWin->setDecryptMessageOverwrite(true);
     initKMReaderMainWin();
 }
diff --git a/src/kmreaderwin.h b/src/kmreaderwin.h
--- a/src/kmreaderwin.h
+++ b/src/kmreaderwin.h
@@ -96,7 +96,8 @@
 
     /** Override default load external references setting */
     bool htmlLoadExtOverride() const;
-    void setHtmlLoadExtOverride(bool override);
+    void setHtmlLoadExtDefault(bool loadExtDefault);
+    void setHtmlLoadExtOverride(bool loadExtOverride);
 
     /** Is html mail to be supported? Takes into account override */
     bool htmlMail() const;
diff --git a/src/kmreaderwin.cpp b/src/kmreaderwin.cpp
--- a/src/kmreaderwin.cpp
+++ b/src/kmreaderwin.cpp
@@ -392,9 +392,14 @@
     mViewer->setDisplayFormatMessageOverwrite(format);
 }
 
-void KMReaderWin::setHtmlLoadExtOverride(bool override)
+void KMReaderWin::setHtmlLoadExtDefault(bool loadExtDefault)
 {
-    mViewer->setHtmlLoadExtOverride(override);
+    mViewer->setHtmlLoadExtDefault(loadExtDefault);
+}
+
+void KMReaderWin::setHtmlLoadExtOverride(bool loadExtOverride)
+{
+    mViewer->setHtmlLoadExtOverride(loadExtOverride);
 }
 
 bool KMReaderWin::htmlMail() const