diff --git a/packages/stream_chat_flutter/lib/src/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget.dart
index 80615a5c..dc739a72 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget.dart
@@ -910,7 +910,7 @@ class _StreamMessageWidgetState extends State<StreamMessageWidget>
 
     children.addAll([
       if (showUsername)
-        WidgetSpan(child: Flexible(child: _buildUsername(usernameKey))),
+        WidgetSpan(child: _buildUsername(usernameKey)),
       if (showTimeStamp)
         WidgetSpan(
           child: Text(
@@ -921,7 +921,7 @@ class _StreamMessageWidgetState extends State<StreamMessageWidget>
       if (showSendingIndicator)
         WidgetSpan(
           child: _buildSendingIndicator(),
-          alignment: PlaceholderAlignment.top,
+          alignment: PlaceholderAlignment.middle,
         ),
     ]);