diff --git a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp
index 19e44ab69..6b2795b45 100644
--- a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp
+++ b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp
@@ -29,6 +29,8 @@ TextBrowserViewer::TextBrowserViewer(QWidget* parent)
   setFrameShadow(QFrame::Shadow::Plain);
   setTabChangesFocus(true);
   setOpenLinks(false);
+  setWordWrapMode(QTextOption::WrapMode::WordWrap);
+
   viewport()->setAutoFillBackground(true);
 
   setResourcesEnabled(qApp->settings()->value(GROUP(Messages), SETTING(Messages::ShowResourcesInArticles)).toBool());
@@ -123,7 +125,8 @@ PreparedHtml TextBrowserViewer::prepareHtmlForMessage(const QList<Message>& mess
     }
 
     // Append actual contents of article and convert to HTML if needed.
-    html.m_html += is_plain ? Qt::convertFromPlainText(message.m_contents) : message.m_contents;
+    html.m_html += is_plain ? Qt::convertFromPlainText(message.m_contents, Qt::WhiteSpaceMode::WhiteSpaceNormal)
+                            : message.m_contents;
 
     static QRegularExpression img_tag_rgx("\\<img[^\\>]*src\\s*=\\s*[\"\']([^\"\']*)[\"\'][^\\>]*\\>",
                                           QRegularExpression::PatternOption::CaseInsensitiveOption |
diff --git a/src/librssguard/miscellaneous/skinfactory.cpp b/src/librssguard/miscellaneous/skinfactory.cpp
index 879ef8beb..310ec2cd1 100644
--- a/src/librssguard/miscellaneous/skinfactory.cpp
+++ b/src/librssguard/miscellaneous/skinfactory.cpp
@@ -193,8 +193,10 @@ QPair<QString, QUrl> SkinFactory::generateHtmlOfArticles(const QList<Message>& m
                                                                             ? tr("unknown author")
                                                                             : message.m_author),
                                                      message.m_url,
-                                                     is_plain ? Qt::convertFromPlainText(message.m_contents)
-                                                              : message.m_contents,
+                                                     is_plain
+                                                       ? Qt::convertFromPlainText(message.m_contents,
+                                                                                  Qt::WhiteSpaceMode::WhiteSpaceNormal)
+                                                       : message.m_contents,
                                                      msg_date,
                                                      enclosures,
                                                      enclosure_images,