diff --git a/package/src/components/Channel/Channel.tsx b/package/src/components/Channel/Channel.tsx
index 486a031a96..3c6ad24c92 100644
--- a/package/src/components/Channel/Channel.tsx
+++ b/package/src/components/Channel/Channel.tsx
@@ -584,7 +584,7 @@ const ChannelWithContext = <
     MessageStatus = MessageStatusDefault,
     MessageSystem = MessageSystemDefault,
     MessageText,
-    messageTextNumberOfLines = 5,
+    messageTextNumberOfLines,
     MessageTimestamp = MessageTimestampDefault,
     MessageUserReactions = MessageUserReactionsDefault,
     MessageUserReactionsAvatar = MessageUserReactionsAvatarDefault,
diff --git a/package/src/components/Message/MessageSimple/utils/generateMarkdownText.ts b/package/src/components/Message/MessageSimple/utils/generateMarkdownText.ts
index 2851be1376..4e116cc4f2 100644
--- a/package/src/components/Message/MessageSimple/utils/generateMarkdownText.ts
+++ b/package/src/components/Message/MessageSimple/utils/generateMarkdownText.ts
@@ -35,5 +35,11 @@ export const generateMarkdownText = (text?: string) => {
 
   resultText = resultText.replace(/[<"'>]/g, '\\$&');
 
+  // Remove whitespaces that come directly after newlines except in code blocks where we deem this allowed.
+  resultText = resultText.replace(/(```[\s\S]*?```|`.*?`)|\n[ ]{2,}/g, (_, code) => {
+    if (code) return code;
+    return '\n';
+  });
+
   return resultText;
 };
diff --git a/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap b/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
index 6b13824ab7..b21f26a3ea 100644
--- a/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
+++ b/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
@@ -475,9 +475,12 @@ exports[`Thread should match thread snapshot 1`] = `
                                   }
                                 >
                                   <Text
-                                    numberOfLines={5}
                                     style={
                                       {
+                                        "alignItems": "flex-start",
+                                        "flexDirection": "row",
+                                        "flexWrap": "wrap",
+                                        "justifyContent": "flex-start",
                                         "marginBottom": 8,
                                         "marginTop": 8,
                                       }
@@ -823,9 +826,12 @@ exports[`Thread should match thread snapshot 1`] = `
                                   }
                                 >
                                   <Text
-                                    numberOfLines={5}
                                     style={
                                       {
+                                        "alignItems": "flex-start",
+                                        "flexDirection": "row",
+                                        "flexWrap": "wrap",
+                                        "justifyContent": "flex-start",
                                         "marginBottom": 8,
                                         "marginTop": 8,
                                       }
@@ -1171,9 +1177,12 @@ exports[`Thread should match thread snapshot 1`] = `
                                   }
                                 >
                                   <Text
-                                    numberOfLines={5}
                                     style={
                                       {
+                                        "alignItems": "flex-start",
+                                        "flexDirection": "row",
+                                        "flexWrap": "wrap",
+                                        "justifyContent": "flex-start",
                                         "marginBottom": 8,
                                         "marginTop": 8,
                                       }
@@ -1553,9 +1562,12 @@ exports[`Thread should match thread snapshot 1`] = `
                                       }
                                     >
                                       <Text
-                                        numberOfLines={5}
                                         style={
                                           {
+                                            "alignItems": "flex-start",
+                                            "flexDirection": "row",
+                                            "flexWrap": "wrap",
+                                            "justifyContent": "flex-start",
                                             "marginBottom": 8,
                                             "marginTop": 8,
                                           }