diff --git a/melos.yaml b/melos.yaml
index 1fb51c38..6232c3fa 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -56,7 +56,7 @@ scripts:
       dir-exists: test
 
   test:flutter:
-    run: melos exec -c 1 --fail-fast -- "flutter test --coverage"
+    run: melos exec -c 3 --fail-fast -- "flutter test --coverage"
     description: Run Flutter tests for a specific package in this project.
     select-package:
       flutter: true
diff --git a/packages/stream_chat_flutter/lib/src/message_text.dart b/packages/stream_chat_flutter/lib/src/message_text.dart
index e5abede0..6d006085 100644
--- a/packages/stream_chat_flutter/lib/src/message_text.dart
+++ b/packages/stream_chat_flutter/lib/src/message_text.dart
@@ -29,7 +29,7 @@ class MessageText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final text = _replaceMentions(message.text ?? '').replaceAll('\n', '\\\n');
+    final text = _replaceMentions(message.text ?? '').replaceAll('\n', '\n\n');
 
     final themeData = Theme.of(context);
     return MarkdownBody(
diff --git a/packages/stream_chat_flutter/test/src/goldens/message_text.png b/packages/stream_chat_flutter/test/src/goldens/message_text.png
new file mode 100644
index 00000000..dda158b2
Binary files /dev/null and b/packages/stream_chat_flutter/test/src/goldens/message_text.png differ
diff --git a/packages/stream_chat_flutter/test/src/message_text_test.dart b/packages/stream_chat_flutter/test/src/message_text_test.dart
index a8aba86a..501d8c0f 100644
--- a/packages/stream_chat_flutter/test/src/message_text_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_text_test.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:golden_toolkit/golden_toolkit.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
 import 'mocks.dart';
+import 'simple_frame.dart';
 
 void main() {
   testWidgets(
@@ -51,4 +53,57 @@ void main() {
       expect(find.byType(MarkdownBody), findsOneWidget);
     },
   );
+
+  testGoldens(
+    'control test',
+    (WidgetTester tester) async {
+      final client = MockClient();
+      final clientState = MockClientState();
+      final channel = MockChannel();
+      final channelState = MockChannelState();
+      final lastMessageAt = DateTime.parse('2020-06-22 12:00:00');
+      final themeData = ThemeData();
+      final streamTheme = StreamChatThemeData.fromTheme(themeData);
+
+      when(() => client.state).thenReturn(clientState);
+      when(() => clientState.user).thenReturn(OwnUser(id: 'user-id'));
+      when(() => channel.lastMessageAt).thenReturn(lastMessageAt);
+      when(() => channel.state).thenReturn(channelState);
+      when(() => channel.client).thenReturn(client);
+      when(() => channel.isMuted).thenReturn(false);
+      when(() => channel.isMutedStream).thenAnswer((i) => Stream.value(false));
+      when(() => channel.extraDataStream).thenAnswer((i) => Stream.value({
+            'name': 'test',
+          }));
+      when(() => channel.extraData).thenReturn({
+        'name': 'test',
+      });
+
+      final messageText = '''a message.
+with multiple lines
+and a list:
+- a. okasd
+- b lllll
+
+cool.''';
+
+      await tester.pumpWidgetBuilder(
+        materialAppWrapper()(SimpleFrame(
+          child: StreamChannel(
+            channel: channel,
+            child: Scaffold(
+              body: MessageText(
+                message: Message(
+                  text: messageText,
+                ),
+                messageTheme: streamTheme.otherMessageTheme,
+              ),
+            ),
+          ),
+        )),
+        surfaceSize: const Size(500, 500),
+      );
+      await screenMatchesGolden(tester, 'message_text');
+    },
+  );
 }