diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 797bb83ba..6bf05df66 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -26,7 +26,7 @@
   <url type="donation">https://github.com/sponsors/martinrotter</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="4.0.3" date="2021-10-13"/>
+    <release version="4.0.3" date="2021-10-15"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/src/librssguard/gui/feedmessageviewer.cpp b/src/librssguard/gui/feedmessageviewer.cpp
index 70e78e450..ca3e3a305 100644
--- a/src/librssguard/gui/feedmessageviewer.cpp
+++ b/src/librssguard/gui/feedmessageviewer.cpp
@@ -91,6 +91,11 @@ void FeedMessageViewer::saveSize() {
   // Store offsets of splitters.
   settings->setValue(GROUP(GUI), GUI::SplitterFeeds, toVariant(m_feedSplitter->sizes()));
 
+  // We need to display message previewer so that it "has" some dimensions
+  // so that they can be saved.
+  m_messagesBrowser->show();
+  qApp->processEvents();
+
   if (!settings->value(GROUP(GUI), SETTING(GUI::SplitterMessagesIsVertical)).toBool()) {
     settings->setValue(GROUP(GUI),
                        GUI::SplitterMessagesHorizontal,
@@ -116,15 +121,12 @@ void FeedMessageViewer::loadSize() {
   m_feedSplitter->setSizes(toList<int>(settings->value(GROUP(GUI),
                                                        SETTING(GUI::SplitterFeeds))));
 
-  if (!settings->value(GROUP(GUI), SETTING(GUI::SplitterMessagesIsVertical)).toBool()) {
-    switchMessageSplitterOrientation(false);
-    m_messageSplitter->setSizes(toList<int>(settings->value(GROUP(GUI),
-                                                            SETTING(GUI::SplitterMessagesHorizontal))));
-  }
-  else {
+  if (settings->value(GROUP(GUI), SETTING(GUI::SplitterMessagesIsVertical)).toBool()) {
     m_messageSplitter->setSizes(toList<int>(settings->value(GROUP(GUI),
                                                             SETTING(GUI::SplitterMessagesVertical))));
-
+  }
+  else {
+    switchMessageSplitterOrientation(false);
   }
 
   QString settings_msg_header = settings->value(GROUP(GUI), SETTING(GUI::MessageViewState)).toString();
@@ -149,6 +151,14 @@ bool FeedMessageViewer::areListHeadersEnabled() const {
 }
 
 void FeedMessageViewer::switchMessageSplitterOrientation(bool save_settings) {
+  bool preview_visible = m_messagesBrowser->isVisible();
+
+  if (!preview_visible && save_settings) {
+    // Must be visible to get correct dimensions to be saved.
+    m_messagesBrowser->show();
+    qApp->processEvents();
+  }
+
   if (m_messageSplitter->orientation() == Qt::Orientation::Vertical) {
     if (save_settings) {
       qApp->settings()->setValue(GROUP(GUI),
@@ -172,6 +182,12 @@ void FeedMessageViewer::switchMessageSplitterOrientation(bool save_settings) {
                                                                     SETTING(GUI::SplitterMessagesVertical))));
   }
 
+  if (!preview_visible && save_settings) {
+    // Must be visible to get correct dimensions to be saved.
+    m_messagesBrowser->hide();
+    qApp->processEvents();
+  }
+
   qApp->settings()->setValue(GROUP(GUI),
                              GUI::SplitterMessagesIsVertical,
                              m_messageSplitter->orientation() == Qt::Orientation::Vertical);