diff --git a/bin/unit_tests/assets/html/whitespace_pre.html b/bin/unit_tests/assets/html/whitespace_pre.html
new file mode 100644
index 000000000..69b6b6876
--- /dev/null
+++ b/bin/unit_tests/assets/html/whitespace_pre.html
@@ -0,0 +1,116 @@
+<!doctype html>
+<html lang="en" class="swup-enabled swup-native">
+  <head>
+    <style>
+      :root {
+        --b-font-main: system-ui, sans-serif;
+        --b-font-mono:
+          ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
+          "Liberation Mono", "Courier New", monospace;
+        --b-txt: #dcd7ba;
+        --b-bg-1: #18171f;
+        --b-bg-2: #2d4f67;
+        --b-line: #727169;
+        --b-link: #ffa066;
+        --b-heading: #fff;
+        --b-btn-bg: #2d4f67;
+        --b-btn-txt: #c8c093;
+        --b-focus: #2d4f67;
+        --b-accent-1: #e6c384;
+        --b-accent-2: #c34043;
+        --b-selection-color: #c8c093;
+        --b-selection-bg: #2d4f67;
+      }
+      *,
+      :before,
+      :after {
+        box-sizing: border-box;
+      }
+      ::selection {
+        color: var(--b-selection-color);
+        background-color: var(--b-selection-bg);
+      }
+      body {
+        background: var(--b-bg-1);
+        max-width: 70ch;
+        font-family: var(--b-font-main);
+        font-feature-settings: "lnum" 1;
+        font-variant-numeric: slashed-zero;
+        text-rendering: optimizeLegibility;
+        color: var(--b-txt);
+        -moz-tab-size: 4;
+        tab-size: 4;
+        word-break: break-word;
+        overflow-wrap: break-word;
+        margin: auto;
+        padding: 0 1rem;
+        line-height: 1.5;
+      }
+      h1,
+      h2,
+      h3,
+      h4,
+      h5,
+      h6,
+      p,
+      ul,
+      ol,
+      dl,
+      dd,
+      details,
+      blockquote,
+      pre,
+      figure,
+      table,
+      address,
+      hr,
+      fieldset,
+      iframe,
+      audio,
+      video {
+        margin: 0 0 1.5rem;
+      }
+      pre,
+      code,
+      kbd,
+      samp,
+      tt,
+      var {
+        background: var(--b-bg-2);
+        font-family: var(--b-font-mono);
+        border-radius: 0.25rem;
+        padding: 0.125rem 0.25rem;
+        font-size: 0.875em;
+      }
+      pre {
+        white-space: pre;
+        padding: 1rem;
+        overflow: auto;
+      }
+      pre code {
+        background-color: inherit;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div itemprop="ArticleBody text" class="main-content">
+      <pre
+        class="language-json"
+        data-lang="json"
+        style="color: #c0c5ce; background-color: #2b303b"
+      ><code class="language-json" data-lang="json"><span style="color:#65737e">// in the "LSP Settings" file, under "clients[]"
+</span><span>"</span><span style="color:#a3be8c">md-lsp</span><span>": {
+</span><span>  </span><span style="color:#65737e">// default enabled?
+</span><span>  "</span><span style="color:#a3be8c">enabled</span><span>": </span><span style="color:#d08770">true</span><span>,
+</span><span>  "</span><span style="color:#a3be8c">command</span><span>": [
+</span><span>    </span><span style="color:#65737e">// as long as the system path is setup right, we can find this binary
+</span><span>    "</span><span style="color:#a3be8c">md-lsp</span><span>",
+</span><span>  ],
+</span><span>  </span><span style="color:#65737e">// when we see this scope, the LSP will start this server
+</span><span>  "</span><span style="color:#a3be8c">selector</span><span>": "</span><span style="color:#a3be8c">text.html.markdown</span><span>",
+</span><span>},
+</span></code></pre>
+    </div>
+  </body>
+</html>
diff --git a/src/eepp/graphics/richtext.cpp b/src/eepp/graphics/richtext.cpp
index 0c43a8c9e..f9f81c3ee 100644
--- a/src/eepp/graphics/richtext.cpp
+++ b/src/eepp/graphics/richtext.cpp
@@ -968,17 +968,23 @@ class RichTextInlineLayouter {
 						}
 					}
 
+					bool isLastTextSegment = i + 2 == wrapInfo.wraps.size();
+					bool trailingNewlineAlreadyAdvanced =
+						isNewline && isLastTextSegment && result.lines.back().spans.empty() &&
+						i > 0 && wrapInfo.wraps[i - 1] != wrapInfo.wraps[i];
 					if ( i < wrapInfo.wraps.size() - 2 || isNewline ) {
 						if ( isNewline ) {
 							curCharIdx++;
-							if ( i == wrapInfo.wraps.size() - 2 ) {
+							if ( isLastTextSegment ) {
 								addInlineSpacingToCurrentLine(
 									result, curX, inlineEndSpacing( payload, inlineItems ) );
 							}
 						}
-						maxWidth = std::max( maxWidth, curX );
-						result.lines.push_back( RichText::RenderParagraph() );
-						curX = 0;
+						if ( !trailingNewlineAlreadyAdvanced ) {
+							maxWidth = std::max( maxWidth, curX );
+							result.lines.push_back( RichText::RenderParagraph() );
+							curX = 0;
+						}
 					}
 				}
 			} else {
@@ -1189,17 +1195,23 @@ class RichTextInlineLayouter {
 						}
 					}
 
+					bool isLastTextSegment = i + 2 == wrapInfo.wraps.size();
+					bool trailingNewlineAlreadyAdvanced =
+						isNewline && isLastTextSegment && result.lines.back().spans.empty() &&
+						i > 0 && wrapInfo.wraps[i - 1] != wrapInfo.wraps[i];
 					if ( i < wrapInfo.wraps.size() - 2 || isNewline ) {
 						if ( isNewline ) {
 							curCharIdx++;
-							if ( i == wrapInfo.wraps.size() - 2 ) {
+							if ( isLastTextSegment ) {
 								addInlineSpacingToCurrentLine(
 									result, curX, inlineEndSpacing( payload, inlineItems ) );
 							}
 						}
-						maxWidth = std::max( maxWidth, curX );
-						result.lines.push_back( RichText::RenderParagraph() );
-						curX = 0;
+						if ( !trailingNewlineAlreadyAdvanced ) {
+							maxWidth = std::max( maxWidth, curX );
+							result.lines.push_back( RichText::RenderParagraph() );
+							curX = 0;
+						}
 					}
 				}
 			} else {
diff --git a/src/eepp/ui/uirichtext.cpp b/src/eepp/ui/uirichtext.cpp
index c0f04c8dd..9cbbb0c44 100644
--- a/src/eepp/ui/uirichtext.cpp
+++ b/src/eepp/ui/uirichtext.cpp
@@ -1483,8 +1483,13 @@ static void addProcessedTextSpan( RichText& richText, ProcessedText&& text,
 static UIRichText::WhiteSpaceCollapse getEffectiveWhiteSpaceCollapse( Node* node,
 																	  UIRichText* fallback ) {
 	for ( Node* cur = node; cur; cur = cur->getParent() ) {
-		if ( cur->isType( UI_TYPE_TEXTSPAN ) || cur->isType( UI_TYPE_RICHTEXT ) )
-			return cur->asType<UIRichText>()->getWhiteSpaceCollapse();
+		if ( cur->isType( UI_TYPE_TEXTSPAN ) || cur->isType( UI_TYPE_RICHTEXT ) ) {
+			auto* richText = cur->asType<UIRichText>();
+			auto* style = richText->getUIStyle();
+			if ( style == nullptr || style->hasLocalProperty( PropertyId::WhiteSpace ) ||
+				 style->hasLocalProperty( PropertyId::WhiteSpaceCollapse ) )
+				return richText->getWhiteSpaceCollapse();
+		}
 	}
 	return fallback ? fallback->getWhiteSpaceCollapse() : UIRichText::WhiteSpaceCollapse::Collapse;
 }
@@ -1842,9 +1847,9 @@ void UIRichText::rebuildRichText( UILayout* container, RichText& richText, Intri
 				return;
 			}
 
-			auto text = processWhiteSpaceForLayout(
-				textNode->getText().view(), collapse, prevIsInline, nextIsInline,
-				lastSpanEndsWithSpace, textNode->getNextNode() == nullptr );
+			auto text =
+				processWhiteSpaceForLayout( textNode->getText().view(), collapse, prevIsInline,
+											nextIsInline, lastSpanEndsWithSpace, next == nullptr );
 			auto tt = getEffectiveTextTransform( textNode );
 			String transformed;
 			if ( tt != TextTransform::None ) {
@@ -1958,7 +1963,7 @@ void UIRichText::rebuildRichText( UILayout* container, RichText& richText, Intri
 				richText.setWhiteSpaceWrapMode( toRichTextWhiteSpaceWrapMode( collapse ) );
 				auto spanText = processWhiteSpaceForLayout(
 					span->getText().view(), collapse, prevIsInline, nextIsInline,
-					lastSpanEndsWithSpace, span->getFirstChild() == nullptr );
+					lastSpanEndsWithSpace, span->getFirstChild() == nullptr && next == nullptr );
 				auto tt = getEffectiveTextTransform( span );
 				if ( tt != TextTransform::None ) {
 					String transformed = materializeTransformedText( spanText.view, tt );
diff --git a/src/eepp/ui/uiscrollview.cpp b/src/eepp/ui/uiscrollview.cpp
index bef382101..0498b848b 100644
--- a/src/eepp/ui/uiscrollview.cpp
+++ b/src/eepp/ui/uiscrollview.cpp
@@ -44,7 +44,7 @@ UIScrollView::UIScrollView( const std::string& tag ) :
 	listenParent();
 }
 
-UIScrollView::UIScrollView() : UIScrollView( "webview" ) {}
+UIScrollView::UIScrollView() : UIScrollView( "scrollview" ) {}
 
 UIScrollView::~UIScrollView() {
 	clearListeners();
@@ -219,10 +219,8 @@ void UIScrollView::containerUpdate() {
 		mHScroll->setVisible( false );
 		mHScroll->setEnabled( false );
 	} else {
-		auto scrollViewWidth = mScrollView->getPixelsSize().getWidth();
-		auto meInnerWidth = std::ceil( getPixelsSize().getWidth() - getPixelsPadding().Left -
-									   getPixelsPadding().Right );
-		auto visible = scrollViewWidth > meInnerWidth;
+		bool visible = mScrollView->getSize().getWidth() >
+					   getSize().getWidth() - getPadding().Left - getPadding().Right;
 
 		mHScroll->setVisible( visible );
 		mHScroll->setEnabled( visible );
@@ -235,9 +233,8 @@ void UIScrollView::containerUpdate() {
 		mVScroll->setVisible( false );
 		mVScroll->setEnabled( false );
 	} else {
-		bool visible = mScrollView->getPixelsSize().getHeight() > getPixelsSize().getHeight() -
-																	  getPixelsPadding().Top -
-																	  getPixelsPadding().Bottom;
+		bool visible = mScrollView->getSize().getHeight() >
+					   getSize().getHeight() - getPadding().Top - getPadding().Bottom;
 
 		mVScroll->setVisible( visible );
 		mVScroll->setEnabled( visible );
diff --git a/src/eepp/ui/uiwidgetcreator.cpp b/src/eepp/ui/uiwidgetcreator.cpp
index 201456512..693964022 100644
--- a/src/eepp/ui/uiwidgetcreator.cpp
+++ b/src/eepp/ui/uiwidgetcreator.cpp
@@ -81,7 +81,7 @@ h6 { font-size: 0.67em; font-weight: bold; margin: 2.33em 0; }
 p { margin: 1em 0; }
 pre { margin: 1em 0; white-space: pre; }
 blockquote { margin: 1em 0; }
-hr { display: block; border-width: 1px; border-color: gray; margin: 0.5em 0; }
+hr { display: block; border-width: 1px; border-color: gray; margin: 0.5em 0; min-height: 2px; }
 ul, ol, dl { margin: 1em 0; }
 
 b, strong { font-weight: bold; }
diff --git a/src/tests/unit_tests/uihtml_tests.cpp b/src/tests/unit_tests/uihtml_tests.cpp
index 803fd7582..dac94d2ce 100644
--- a/src/tests/unit_tests/uihtml_tests.cpp
+++ b/src/tests/unit_tests/uihtml_tests.cpp
@@ -895,6 +895,35 @@ UTEST( UIHTML, PreCodeBlockFixtureKeepsCompactCodeLines ) {
 	Engine::destroySingleton();
 }
 
+UTEST( UIHTML, WhiteSpacePreInheritedBySyntaxSpansPreservesEmbeddedBreaks ) {
+	init_ui_test();
+	UISceneNode* sceneNode = SceneManager::instance()->getUISceneNode();
+	sceneNode->setURI( "file://" + Sys::getProcessPath() + "assets/html/" );
+
+	std::string html;
+	ASSERT_TRUE( FileSystem::fileGet( "assets/html/whitespace_pre.html", html ) );
+	sceneNode->loadLayoutFromString( HTMLFormatter::HTMLtoXML( html ) );
+	SceneManager::instance()->update();
+
+	UIRichText* pre = nullptr;
+	sceneNode->getRoot()->forEachNode( [&pre]( Node* node ) {
+		if ( pre == nullptr && node->isWidget() &&
+			 node->asType<UIWidget>()->getElementTag() == "pre" )
+			pre = node->asType<UIRichText>();
+	} );
+	ASSERT_TRUE( pre != nullptr );
+
+	const auto& lines = pre->getRichTextPtr()->getLines();
+	ASSERT_EQ( lines.size(), (size_t)11 );
+	EXPECT_STRINGEQ( uiHtmlLineText( *pre->getRichTextPtr(), 0 ),
+					 "// in the \"LSP Settings\" file, under \"clients[]\"" );
+	EXPECT_STRINGEQ( uiHtmlLineText( *pre->getRichTextPtr(), 1 ), "\"md-lsp\": {" );
+	EXPECT_STRINGEQ( uiHtmlLineText( *pre->getRichTextPtr(), 3 ), "  \"enabled\": true," );
+	EXPECT_STRINGEQ( uiHtmlLineText( *pre->getRichTextPtr(), 10 ), "}," );
+
+	Engine::destroySingleton();
+}
+
 UTEST( UIHTML, WhiteSpaceCollapsePreLinePreservesBreaksOnly ) {
 	init_ui_test();
 	UISceneNode* sceneNode = SceneManager::instance()->getUISceneNode();
