diff --git a/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift b/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
index 9a452e3f..4cab6cd7 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
@@ -889,13 +889,6 @@ extension Label {
     /// Underlines the tappable region and stores the tap logic for interation.
     private func setTextLinkState(range: NSRange, actionBlock: @escaping ActionBlock) {
         
-        if clauses.isEmpty {
-            // Replace the last whitespace with \u{00A0} No-break space.
-            if let start = text?.lastIndex(of: " "), let end = text?.index(after: start) {
-                text?.replaceSubrange(start..<end, with: "\u{00A0}")
-            }
-        }
-        
         setActionAttributes(range: range)
         appendActionableClause(range: range, actionBlock: actionBlock)
     }
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
index 8144fc03..93eace61 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
@@ -112,8 +112,7 @@ open class HeadlineBody: View {
         headlineLabel.updateView(size)
         messageLabel.updateView(size)
         let padding = MFStyler.defaultHorizontalPadding(forSize: size) * 2
-        let maximumTextWidth = (size - (padding + Padding.Four))
-        messageLabel.preferredMaxLayoutWidth = maximumTextWidth
+        messageLabel.preferredMaxLayoutWidth = size - padding
     }
     
     //--------------------------------------------------