diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index b6346ef88..a3275a7da 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -215,7 +215,7 @@ class HtmlMessage extends StatelessWidget {
         : [];
 
     for (final TokenPosition tokenPosition in tokenPositions) {
-      final String tokenSpanText = tokens!
+      String tokenSpanText = tokens!
           .sublist(tokenPosition.startIndex, tokenPosition.endIndex + 1)
           .map((t) => t.text.content)
           .join();
@@ -244,6 +244,11 @@ class HtmlMessage extends StatelessWidget {
           .skip(tokenIndex + tokenLength)
           .toString();
 
+      if (after.startsWith('\n')) {
+        after.replaceFirst('\n', '');
+        tokenSpanText += '\n';
+      }
+
       result.replaceRange(substringIndex, substringIndex + 1, [
         if (before.isNotEmpty) before,
         '<token offset="${tokenPosition.token!.text.offset}" length="${tokenPosition.token!.text.length}">$tokenSpanText</token>',
@@ -253,10 +258,6 @@ class HtmlMessage extends StatelessWidget {
       position = substringIndex;
     }
 
-    for (int i = 0; i < result.length; i++) {
-      if (result[i] == '\n') result[i] = '<br>';
-    }
-
     if (pangeaMessageEvent?.textDirection == TextDirection.rtl) {
       for (int i = 0; i < result.length; i++) {
         final tag = result[i];
@@ -274,6 +275,8 @@ class HtmlMessage extends StatelessWidget {
       final inverted = _invertTags(result);
       return inverted.join().trim();
     }
+
+    debugPrint("HTML after adding token tags: $result");
     return result.join().trim();
   }
 
@@ -425,62 +428,68 @@ class HtmlMessage extends StatelessWidget {
           node.text,
         );
 
-        return WidgetSpan(
-          alignment: readingAssistanceMode == ReadingAssistanceMode.practiceMode
-              ? PlaceholderAlignment.bottom
-              : PlaceholderAlignment.middle,
-          child: Column(
-            children: [
-              if (renderer.showCenterStyling && token != null)
-                MessageTokenButton(
-                  token: token,
-                  overlayController: overlayController,
-                  textStyle: renderer.style(
-                    context,
-                    color: renderer.backgroundColor(
-                      context,
-                      selected,
-                      highlighted,
-                      isNew,
-                    ),
-                  ),
-                  width: tokenWidth,
-                  animateIn: isTransitionAnimation,
-                ),
-              MouseRegion(
-                cursor: SystemMouseCursors.click,
-                child: GestureDetector(
-                  behavior: HitTestBehavior.translucent,
-                  onTap: onClick != null && token != null
-                      ? () => onClick?.call(token)
-                      : null,
-                  child: RichText(
-                    textDirection: pangeaMessageEvent?.textDirection,
-                    text: TextSpan(
-                      children: [
-                        LinkifySpan(
-                          text: node.text,
-                          style: renderer.style(
-                            context,
-                            color: renderer.backgroundColor(
-                              context,
-                              selected,
-                              highlighted,
-                              isNew,
-                            ),
-                          ),
-                          linkStyle: linkStyle,
-                          onOpen: (url) =>
-                              UrlLauncher(context, url.url).launchUrl(),
+        return TextSpan(
+          children: [
+            WidgetSpan(
+              alignment:
+                  readingAssistanceMode == ReadingAssistanceMode.practiceMode
+                      ? PlaceholderAlignment.bottom
+                      : PlaceholderAlignment.middle,
+              child: Column(
+                children: [
+                  if (renderer.showCenterStyling && token != null)
+                    MessageTokenButton(
+                      token: token,
+                      overlayController: overlayController,
+                      textStyle: renderer.style(
+                        context,
+                        color: renderer.backgroundColor(
+                          context,
+                          selected,
+                          highlighted,
+                          isNew,
                         ),
-                      ],
+                      ),
+                      width: tokenWidth,
+                      animateIn: isTransitionAnimation,
+                    ),
+                  MouseRegion(
+                    cursor: SystemMouseCursors.click,
+                    child: GestureDetector(
+                      behavior: HitTestBehavior.translucent,
+                      onTap: onClick != null && token != null
+                          ? () => onClick?.call(token)
+                          : null,
+                      child: RichText(
+                        textDirection: pangeaMessageEvent?.textDirection,
+                        text: TextSpan(
+                          children: [
+                            LinkifySpan(
+                              text: node.text.trim(),
+                              style: renderer.style(
+                                context,
+                                color: renderer.backgroundColor(
+                                  context,
+                                  selected,
+                                  highlighted,
+                                  isNew,
+                                ),
+                              ),
+                              linkStyle: linkStyle,
+                              onOpen: (url) =>
+                                  UrlLauncher(context, url.url).launchUrl(),
+                            ),
+                          ],
+                        ),
+                      ),
                     ),
                   ),
-                ),
+                ],
+                // ),
               ),
-            ],
-            // ),
-          ),
+            ),
+            if (node.text.endsWith('\n')) const TextSpan(text: '\n'),
+          ],
         );
       // Pangea#
       case 'br':
diff --git a/lib/pangea/extensions/room_events_extension.dart b/lib/pangea/extensions/room_events_extension.dart
index 9de8a4c40..4b8195601 100644
--- a/lib/pangea/extensions/room_events_extension.dart
+++ b/lib/pangea/extensions/room_events_extension.dart
@@ -247,6 +247,7 @@ extension EventsRoomExtension on Room {
         event['body'],
         getEmotePacks: () => getImagePacksFlat(ImagePackUsage.emoticon),
         getMention: getMention,
+        convertLinebreaks: client.convertLinebreaksInFormatting,
       );
       // if the decoded html is the same as the body, there is no need in sending a formatted message
       if (HtmlUnescape().convert(html.replaceAll(RegExp(r'<br />\n?'), '\n')) !=