From fcacdd8bd83a1ddfc8b3f263314769904b9f72fb Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 14:25:53 +0200
Subject: [PATCH 01/22] fix(ui, localization): announce message sender and
 direction to screen readers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A message row conveyed its sender and direction only visually — through row
alignment and bubble color — so a screen reader announced the content and
nothing about who sent it. A deleted message was worse: there was no way to
tell whether you or someone else had deleted it.

Each row is now exposed as one labelled node reading "You said, <body>,
<time>" / "<name> said, <body>, <time>", with the deleted placeholder phrased
without the "said" ("You, Message deleted") since the sender never authored
it. The body comes from the existing AccessibleMessagePreviewFormatter, so
attachment-only, poll, location and deleted messages are all covered and a
consumer's custom formatter still applies.

The label is a non-container Semantics annotation with explicitChildNodes
placed inside the row's PlatformWidgetBuilder: it merges into the row's own
tappable node on mobile and forms that node itself on desktop and web, giving
exactly one labelled stop either way, while the attachments, reaction chips,
quoted message, replies row and sending status stay individually focusable.
The fragments the label now speaks — message text, deleted placeholder,
footer username, timestamp and edited marker — are wrapped in
ExcludeSemantics so they are not announced twice.

Trade-off: excluding the message-text subtree removes the per-span semantic
nodes Flutter creates for inline markdown links and mentions, so those can no
longer be activated by a screen reader. Their text is still read as part of
the row label. The SwiftUI, Android and React Native SDKs all collapse the
message text the same way.

Adds a public `semanticsLabel` on StreamMessageItem / StreamMessageItemProps
to replace the composed label, and four AccessibilityTranslations strings with
native implementations for all 11 supported locales.

Resolves FLU-592, FLU-593.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 packages/stream_chat_flutter/CHANGELOG.md     |   2 +
 .../accessibility_translations.dart           |  50 +++
 .../components/stream_message_content.dart    |  19 +-
 .../components/stream_message_footer.dart     |  23 +-
 .../components/stream_message_leading.dart    |  12 +-
 .../message_widget/stream_message_item.dart   | 146 ++++++-
 .../src/utils/message_preview_formatter.dart  |   4 +
 .../stream_message_item_semantics_test.dart   | 393 ++++++++++++++++++
 .../stream_chat_localizations/CHANGELOG.md    |   4 +
 .../lib/src/stream_chat_localizations_ca.dart |  12 +
 .../lib/src/stream_chat_localizations_de.dart |  12 +
 .../lib/src/stream_chat_localizations_en.dart |  12 +
 .../lib/src/stream_chat_localizations_es.dart |  12 +
 .../lib/src/stream_chat_localizations_fr.dart |  12 +
 .../lib/src/stream_chat_localizations_hi.dart |  12 +
 .../lib/src/stream_chat_localizations_it.dart |  12 +
 .../lib/src/stream_chat_localizations_ja.dart |  12 +
 .../lib/src/stream_chat_localizations_ko.dart |  12 +
 .../lib/src/stream_chat_localizations_no.dart |  12 +
 .../lib/src/stream_chat_localizations_pt.dart |  12 +
 .../test/translations_test.dart               |   7 +
 21 files changed, 764 insertions(+), 28 deletions(-)
 create mode 100644 packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 1912e46fca..7dbd628193 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -3,6 +3,7 @@
 ✅ Added
 
 - Added `onReactionLongPress` to `StreamMessageItem` and `StreamMessageListView`, reporting the long-pressed message's `BuildContext` and a `ReactionLongPressDetails` with the `message` and `reaction` (the reaction is `null` for a clustered or overflow chip that maps to no single reaction).
+- Added `semanticsLabel` to `StreamMessageItem` and `StreamMessageItemProps`, replacing the screen-reader announcement composed for a message row.
 
 ⚠️ Changed
 
@@ -15,6 +16,7 @@
 
 🐞 Fixed
 
+- Fixed messages announcing only their content: a screen reader now reads each message row as one phrase naming the sender and the direction — "You said, …" for your own messages, "<name> said, …" for everyone else's — followed by the message body, the time it was sent, and the edited marker, while the attachments, reaction chips, quoted message, replies row, and sending status stay individually reachable. A deleted message announces who deleted it in the same way, without the "said" — "You, Message deleted" / "<name>, Message deleted". A custom `messageBuilder` or `StreamMessageItem` component builder replaces the default layout and is responsible for its own label.
 - Fixed a crash on web when the message list rebuilt while messages were selectable, for example after opening the attachment picker.
 - Fixed the browser's native context menu reappearing over the message context menu on web after scrolling messages out of view or deleting one.
 - Fixed the SDK re-enabling the browser's native context menu on web in apps that had disabled it themselves.
diff --git a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
index 02085f6504..9b009aa0c7 100644
--- a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
+++ b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
@@ -171,6 +171,40 @@ abstract class AccessibilityTranslations {
   /// when [senderName] is null.
   String incomingMessagePreviewLabel({String? senderName});
 
+  /// The screen-reader announcement for a message in the message list that the
+  /// current user sent, e.g. `"You said, are we still meeting tomorrow"`.
+  ///
+  /// [body] is the already-composed message body — the message text, or a type
+  /// label such as `"2 Photos"` for an attachment-only message. The sender and
+  /// the body form a single translation unit so every locale can order and
+  /// inflect the whole clause; some phrase it as "my message" rather than
+  /// "you said".
+  String outgoingMessageLabel({required String body});
+
+  /// The screen-reader announcement for a message in the message list received
+  /// from [senderName], e.g. `"Han Solo said, are we still meeting tomorrow"`.
+  ///
+  /// [senderName] is the sender's resolved, non-empty display name — callers
+  /// omit the announcement entirely when there is no name to announce, so
+  /// implementations can interpolate it directly. See [outgoingMessageLabel]
+  /// for [body].
+  String incomingMessageLabel({required String senderName, required String body});
+
+  /// The screen-reader announcement for a message the current user deleted,
+  /// e.g. `"You, Message deleted"`.
+  ///
+  /// [body] is the composed deleted-message placeholder. Phrased without
+  /// "said" — the sender did not author the placeholder, they deleted what
+  /// they had authored. See [outgoingMessageLabel] for why the body is part
+  /// of the string.
+  String outgoingDeletedMessageLabel({required String body});
+
+  /// The screen-reader announcement for a message [senderName] deleted, e.g.
+  /// `"Han Solo, Message deleted"`.
+  ///
+  /// See [outgoingDeletedMessageLabel] for [body] and the phrasing.
+  String incomingDeletedMessageLabel({required String senderName, required String body});
+
   /// The screen-reader type label for a poll last-message preview, e.g.
   /// `"Poll"`.
   ///
@@ -469,6 +503,22 @@ class DefaultAccessibilityTranslations extends AccessibilityTranslations {
     return senderName ?? 'Message';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => 'You said, $body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) {
+    return '$senderName said, $body';
+  }
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => 'You, $body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) {
+    return '$senderName, $body';
+  }
+
   @override
   String get pollPreviewLabel => 'Poll';
 
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
index b397debf9e..124ddd5394 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
@@ -165,7 +165,9 @@ class _StreamMessageContentState extends State<StreamMessageContent> {
     final spacing = context.streamSpacing;
     final crossAxisAlignment = core.StreamMessageLayout.crossAxisAlignmentOf(context);
 
-    if (widget.message.isDeleted) return const StreamMessageDeleted();
+    // [DefaultStreamMessageItem]'s composed row label already speaks the
+    // deleted placeholder; excluding it here keeps the row a single stop.
+    if (widget.message.isDeleted) return const ExcludeSemantics(child: StreamMessageDeleted());
 
     return core.StreamMessageContent(
       header: widget.header,
@@ -202,11 +204,16 @@ class _StreamMessageContentState extends State<StreamMessageContent> {
                         attachmentBuilders: widget.attachmentBuilders,
                       ),
                       if (widget.message.text case final text? when text.isNotEmpty)
-                        StreamMessageText(
-                          message: widget.message,
-                          onLinkTap: widget.onLinkTap,
-                          onMentionTap: widget.onMentionTap,
-                          onAnyMentionTap: widget.onAnyMentionTap,
+                        // The composed row label speaks the message text, so
+                        // the rendered markdown stays out of the semantics tree
+                        // and the row is announced as one phrase.
+                        ExcludeSemantics(
+                          child: StreamMessageText(
+                            message: widget.message,
+                            onLinkTap: widget.onLinkTap,
+                            onMentionTap: widget.onMentionTap,
+                            onAnyMentionTap: widget.onAnyMentionTap,
+                          ),
                         ),
                     ],
                   ),
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
index 74793ca6ca..4df890c858 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
@@ -65,6 +65,13 @@ class StreamMessageFooterProps {
 ///  * **Sending status** — for the current user's own messages.
 ///  * **Timestamp** — always shown, formatted as a short time string.
 ///  * **Edited label** — when the message text has been updated.
+///
+/// The username, timestamp, and edited label are excluded from the semantics
+/// tree: [DefaultStreamMessageItem] speaks them as part of its composed row
+/// label, so announcing them here as well would add three extra focus stops
+/// per message. Only the sending status contributes a node of its own, because
+/// it tracks the channel read state live. A custom message layout that uses
+/// this footer without a row-level label should re-expose them.
 class DefaultStreamMessageFooter extends StatelessWidget {
   /// Creates a default message footer with the given [props].
   const DefaultStreamMessageFooter({super.key, required this.props});
@@ -80,7 +87,9 @@ class DefaultStreamMessageFooter extends StatelessWidget {
 
     Widget? usernameWidget;
     if (message.user case final user? when channelKind == .group && user.id != currentUser?.id) {
-      usernameWidget = Text(user.name, maxLines: 1, overflow: .ellipsis);
+      usernameWidget = ExcludeSemantics(
+        child: Text(user.name, maxLines: 1, overflow: .ellipsis),
+      );
     }
 
     Widget? statusWidget;
@@ -90,15 +99,19 @@ class DefaultStreamMessageFooter extends StatelessWidget {
 
     final Widget timestampWidget;
     if (message.createdAt case final createdAt) {
-      timestampWidget = StreamTimestamp(
-        date: createdAt.toLocal(),
-        formatter: (context, date) => Jiffy.parseFromDateTime(date).jm,
+      timestampWidget = ExcludeSemantics(
+        child: StreamTimestamp(
+          date: createdAt.toLocal(),
+          formatter: (context, date) => Jiffy.parseFromDateTime(date).jm,
+        ),
       );
     }
 
     Widget? editedWidget;
     if (message.messageTextUpdatedAt != null) {
-      editedWidget = Text(context.translations.editedMessageLabel);
+      editedWidget = ExcludeSemantics(
+        child: Text(context.translations.editedMessageLabel),
+      );
     }
 
     return core.StreamMessageMetadata(
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_leading.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_leading.dart
index 7336a88b84..2a46a39dd8 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_leading.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_leading.dart
@@ -94,7 +94,17 @@ class DefaultStreamMessageLeading extends core.NullableStatelessWidget {
     final theme = core.StreamMessageItemTheme.of(context);
     final avatarSize = theme.avatarSize ?? StreamAvatarSize.md;
 
-    Widget avatar = StreamUserAvatar(user: user, showOnlineIndicator: false);
+    Widget avatar = StreamUserAvatar(
+      user: user,
+      showOnlineIndicator: false,
+      // A tappable avatar is its own focus stop and needs words; an untappable
+      // one stays silent, because the composed row label already names the
+      // sender.
+      semanticsLabel: switch (props.onTap) {
+        null => null,
+        _ => user.name,
+      },
+    );
     if (props.onTap case final onTap?) {
       avatar = GestureDetector(behavior: .opaque, onTap: onTap, child: avatar);
     }
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 58429371b6..807697847a 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -94,6 +94,7 @@ class StreamMessageItem extends StatelessWidget {
     void Function(BuildContext, Message)? onBouncedErrorMessageActions,
     void Function(Message)? onEditMessageTap,
     List<StreamAttachmentWidgetBuilder>? attachmentBuilders,
+    String? semanticsLabel,
   }) : assert(
          onReactionsTap == null || onReactionTap == null,
          'Only one of onReactionsTap or onReactionTap can be provided. '
@@ -125,6 +126,7 @@ class StreamMessageItem extends StatelessWidget {
          onBouncedErrorMessageActions: onBouncedErrorMessageActions,
          onEditMessageTap: onEditMessageTap,
          attachmentBuilders: attachmentBuilders,
+         semanticsLabel: semanticsLabel,
        );
 
   /// Creates a chat message widget from pre-built [props].
@@ -183,6 +185,7 @@ class StreamMessageItemProps {
     this.onBouncedErrorMessageActions,
     this.onEditMessageTap,
     this.attachmentBuilders,
+    this.semanticsLabel,
   }) : assert(
          onReactionsTap == null || onReactionTap == null,
          'Only one of onReactionsTap or onReactionTap can be provided. '
@@ -381,6 +384,18 @@ class StreamMessageItemProps {
   /// priority for attachment types they can handle.
   final List<StreamAttachmentWidgetBuilder>? attachmentBuilders;
 
+  /// Screen-reader label for the whole message row.
+  ///
+  /// When null (the default), a label is composed from the message: who sent
+  /// it ("You said" / "<name> said"), the message body, and when it was sent —
+  /// so a screen reader announces the row as a single phrase instead of one
+  /// fragment at a time.
+  ///
+  /// Set this to replace that composition, for example when a custom
+  /// attachment builder renders content the default composition cannot
+  /// describe. An empty string leaves the row unlabeled.
+  final String? semanticsLabel;
+
   /// Returns a copy of this [StreamMessageItemProps] with the given fields
   /// replaced with new values.
   StreamMessageItemProps copyWith({
@@ -410,6 +425,7 @@ class StreamMessageItemProps {
     void Function(BuildContext, Message)? onBouncedErrorMessageActions,
     void Function(Message)? onEditMessageTap,
     List<StreamAttachmentWidgetBuilder>? attachmentBuilders,
+    String? semanticsLabel,
   }) {
     return StreamMessageItemProps(
       message: message ?? this.message,
@@ -437,6 +453,7 @@ class StreamMessageItemProps {
       onBouncedErrorMessageActions: onBouncedErrorMessageActions ?? this.onBouncedErrorMessageActions,
       onEditMessageTap: onEditMessageTap ?? this.onEditMessageTap,
       attachmentBuilders: attachmentBuilders ?? this.attachmentBuilders,
+      semanticsLabel: semanticsLabel ?? this.semanticsLabel,
     );
   }
 }
@@ -487,6 +504,7 @@ class DefaultStreamMessageItem extends StatelessWidget {
     final effectiveErrorBadgeVisibility = resolve((theme) => theme?.errorBadgeVisibility);
     final effectiveMetadataVisibility = resolve((theme) => theme?.metadataVisibility);
     final effectiveRepliesVisibility = resolve((theme) => theme?.repliesVisibility);
+    final effectiveSemanticsLabel = props.semanticsLabel ?? _defaultSemanticsLabel(context, message);
 
     final leadingWidget = effectiveAvatarVisibility.apply(
       StreamMessageLeading(
@@ -613,23 +631,37 @@ class DefaultStreamMessageItem extends StatelessWidget {
             child: MouseRegion(child: child),
           );
         },
-        child: Align(
-          alignment: StreamMessageLayout.alignmentDirectionalOf(context),
-          child: Padding(
-            padding: effectivePadding,
-            child: core.StreamRow(
-              mainAxisSize: .min,
-              spacing: effectiveSpacing,
-              crossAxisAlignment: .end,
-              children: [
-                ?leadingWidget,
-                Flexible(
-                  child: ConstrainedBox(
-                    constraints: BoxConstraints(maxWidth: props.maxWidth),
-                    child: contentWidget,
+        child: Semantics(
+          label: effectiveSemanticsLabel,
+          // `container` stays false so the label merges into the row's own
+          // tappable node instead of adding a second, wordless stop on top of
+          // it. Where nothing inside the row contributes a node — desktop and
+          // web, or a row whose tap and long-press callbacks are both null —
+          // this annotation forms that single node itself.
+          //
+          // `explicitChildNodes` keeps the parts a screen reader must still
+          // reach on their own — the attachments, the reaction chips, the
+          // quoted message, the replies row, the sending status — as separate
+          // nodes instead of folding them into the row phrase.
+          explicitChildNodes: true,
+          child: Align(
+            alignment: StreamMessageLayout.alignmentDirectionalOf(context),
+            child: Padding(
+              padding: effectivePadding,
+              child: core.StreamRow(
+                mainAxisSize: .min,
+                spacing: effectiveSpacing,
+                crossAxisAlignment: .end,
+                children: [
+                  ?leadingWidget,
+                  Flexible(
+                    child: ConstrainedBox(
+                      constraints: BoxConstraints(maxWidth: props.maxWidth),
+                      child: contentWidget,
+                    ),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
           ),
         ),
@@ -647,6 +679,88 @@ class DefaultStreamMessageItem extends StatelessWidget {
     return result;
   }
 
+  // Composes the screen-reader announcement for the whole row: who sent the
+  // message, what it says, and when it was sent. The fragments this label
+  // speaks are kept out of the semantics tree where they are rendered — see
+  // [StreamMessageContent] and [DefaultStreamMessageFooter] — so the row is
+  // announced once instead of once per fragment.
+  String _defaultSemanticsLabel(BuildContext context, Message message) {
+    final translations = context.translations;
+    final currentUser = StreamChat.maybeOf(context)?.currentUser;
+
+    final parts = [
+      _senderAwareBody(context, message, currentUser),
+      translations.accessibility.formatRecentDateTime(message.createdAt.toLocal()),
+      if (message.messageTextUpdatedAt != null) translations.editedMessageLabel,
+    ];
+
+    return parts.where((it) => it.isNotEmpty).join(', ');
+  }
+
+  // "You said, ..." for the current user's own messages, "<name> said, ..." for
+  // everyone else's — the direction a sighted reader gets from the row's
+  // alignment and bubble color.
+  //
+  // A deleted message drops the "said": the sender did not author the
+  // placeholder, they deleted what they had authored, and "You said, Message
+  // deleted" reads as if they had spoken those words.
+  //
+  // Falls back to the bare body when there is no sender to name, and for
+  // system messages, which describe a channel event rather than something a
+  // sender authored.
+  String _senderAwareBody(BuildContext context, Message message, User? currentUser) {
+    final body = _bodySemanticsLabel(context, message, currentUser);
+    if (message.isSystem) return body;
+
+    final sender = message.user;
+    if (sender == null) return body;
+
+    final a11y = context.translations.accessibility;
+    final isDeleted = message.isDeleted;
+
+    if (sender.id == currentUser?.id) {
+      return switch (isDeleted) {
+        true => a11y.outgoingDeletedMessageLabel(body: body),
+        false => a11y.outgoingMessageLabel(body: body),
+      };
+    }
+
+    // Announce the full sender name — screen readers are not width-bound like
+    // the visual footer, and a surname disambiguates when several members
+    // share a first name. Without a name there is nothing to announce.
+    final senderName = sender.name.trim();
+    if (senderName.isEmpty) return body;
+
+    return switch (isDeleted) {
+      true => a11y.incomingDeletedMessageLabel(senderName: senderName, body: body),
+      false => a11y.incomingMessageLabel(senderName: senderName, body: body),
+    };
+  }
+
+  // The message body — text, attachments, poll, location, or the deleted
+  // placeholder — from the formatter that already composes those labels for
+  // the channel list. Omitting `channel` asks for the body without the
+  // formatter's own speaker prefix; the row composes its own above.
+  String _bodySemanticsLabel(BuildContext context, Message message, User? currentUser) {
+    final formatter = StreamChatConfiguration.of(context).messagePreviewFormatter;
+
+    // Mirror what the bubble renders — the translated text with mentions
+    // resolved to display names — so the announcement matches the visible text
+    // instead of raw `@id` tokens.
+    final language = currentUser?.language ?? 'en';
+    final announced = message.translate(language).replaceMentions(linkify: false);
+
+    return switch (formatter) {
+      final AccessibleMessagePreviewFormatter it => it.formatMessageSemanticsLabel(
+        context,
+        announced,
+        currentUser: currentUser,
+      ),
+      _ =>
+        formatter.formatMessage(context, announced, currentUser: currentUser).toPlainText(includePlaceholders: false),
+    };
+  }
+
   // Builds the action list for a bounced (moderation-error) message.
   List<StreamContextMenuAction> _buildBouncedErrorMessageActions({
     required BuildContext context,
diff --git a/packages/stream_chat_flutter/lib/src/utils/message_preview_formatter.dart b/packages/stream_chat_flutter/lib/src/utils/message_preview_formatter.dart
index 0dccaf31cd..6a703e6cde 100644
--- a/packages/stream_chat_flutter/lib/src/utils/message_preview_formatter.dart
+++ b/packages/stream_chat_flutter/lib/src/utils/message_preview_formatter.dart
@@ -132,6 +132,10 @@ abstract interface class AccessibleMessagePreviewFormatter implements MessagePre
   /// [showCaption] mirrors [formatMessage]: when `true` (the default),
   /// attachment and location labels include the message text as a caption;
   /// when `false` they fall back to a type-only label.
+  ///
+  /// Omitting [channel] returns the body on its own, without a speaker prefix —
+  /// callers that compose their own prefix rely on this, so implementations
+  /// must honour it.
   String formatMessageSemanticsLabel(
     BuildContext context,
     Message message, {
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
new file mode 100644
index 0000000000..3f3b896afd
--- /dev/null
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -0,0 +1,393 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+import 'package:stream_chat_flutter/stream_chat_flutter.dart';
+
+import '../mocks.dart';
+
+// Returns sentinels that no hardcoded English label could produce, so the
+// assertions prove the row label was composed through
+// `translations.accessibility` rather than matching an inlined string.
+class _FakeAccessibilityTranslations extends DefaultAccessibilityTranslations {
+  const _FakeAccessibilityTranslations();
+
+  @override
+  String outgoingMessageLabel({required String body}) => 'OUT:$body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => 'IN:$senderName:$body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => 'OUT-DEL:$body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => 'IN-DEL:$senderName:$body';
+
+  @override
+  String formatRecentDateTime(DateTime date) => 'AT-TIME';
+}
+
+class _FakeLocalizations implements StreamChatLocalizations {
+  @override
+  AccessibilityTranslations get accessibility => const _FakeAccessibilityTranslations();
+
+  @override
+  String threadReplyCountText(int count) => count == 1 ? 'singular:$count' : 'plural:$count';
+
+  // Strings the row composes verbatim; only the labels under test are faked.
+  @override
+  String get messageDeletedLabel => DefaultTranslations.instance.messageDeletedLabel;
+
+  @override
+  String get editedMessageLabel => 'EDITED';
+
+  @override
+  String photosAttachmentCountText(int count) => DefaultTranslations.instance.photosAttachmentCountText(count);
+
+  // Anything else throws instead of resolving to null, so an unstubbed lookup
+  // fails the test loudly rather than rendering an empty label.
+  @override
+  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
+class _FakeLocalizationsDelegate extends LocalizationsDelegate<StreamChatLocalizations> {
+  const _FakeLocalizationsDelegate();
+
+  @override
+  bool isSupported(Locale locale) => true;
+
+  @override
+  Future<StreamChatLocalizations> load(Locale locale) async => _FakeLocalizations();
+
+  @override
+  bool shouldReload(_FakeLocalizationsDelegate old) => false;
+}
+
+// A deterministic attachment renderer, so an attachment-only message lays out
+// without loading assets. Renders no semantics of its own, keeping the
+// assertions about the row label unambiguous.
+class _FixedSizeAttachmentBuilder extends StreamAttachmentWidgetBuilder {
+  const _FixedSizeAttachmentBuilder();
+
+  @override
+  bool canHandle(Message message, Map<String, List<Attachment>> attachments) {
+    return attachments.isNotEmpty;
+  }
+
+  @override
+  Widget? build(
+    BuildContext context,
+    Message message,
+    Map<String, List<Attachment>> attachments,
+  ) {
+    return const SizedBox(width: 200, height: 50);
+  }
+}
+
+void main() {
+  group('StreamMessageItem sender and direction announcement', () {
+    final currentUser = OwnUser(id: 'current-user', name: 'Luke Skywalker');
+    final otherUser = User(id: 'other-user', name: 'Han Solo');
+
+    Widget buildScene(
+      Message message, {
+      String? semanticsLabel,
+      StreamMessageAlignment alignment = StreamMessageAlignment.start,
+      // Set to false to resolve the shipped English strings instead of the
+      // sentinels, pinning what a user actually hears.
+      bool fakeTranslations = true,
+    }) {
+      final client = MockClient();
+      final clientState = MockClientState();
+      final channel = MockChannel();
+      final channelState = MockChannelState();
+
+      when(() => client.state).thenReturn(clientState);
+      when(() => clientState.currentUser).thenReturn(currentUser);
+      when(() => clientState.currentUserStream).thenAnswer((_) => Stream.value(currentUser));
+      when(() => channel.client).thenReturn(client);
+      when(() => channel.state).thenReturn(channelState);
+      when(() => channelState.readStream).thenAnswer((_) => Stream.value(const []));
+
+      return MaterialApp(
+        localizationsDelegates: switch (fakeTranslations) {
+          true => const [_FakeLocalizationsDelegate()],
+          false => const <LocalizationsDelegate<Object>>[],
+        },
+        home: StreamChat(
+          client: client,
+          connectivityStream: Stream.value(const [ConnectivityResult.mobile]),
+          child: StreamChannel(
+            channel: channel,
+            child: Scaffold(
+              body: StreamMessageLayout(
+                data: StreamMessageLayoutData(alignment: alignment),
+                child: StreamMessageItem(
+                  message: message,
+                  semanticsLabel: semanticsLabel,
+                  attachmentBuilders: const [_FixedSizeAttachmentBuilder()],
+                ),
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    Message message({
+      User? user,
+      String? text = 'Are we still meeting tomorrow',
+      int replyCount = 0,
+      List<Attachment> attachments = const [],
+      List<User> mentionedUsers = const [],
+      MessageState state = MessageState.sent,
+      DateTime? messageTextUpdatedAt,
+      String type = MessageType.regular,
+    }) {
+      return Message(
+        id: 'test-message',
+        type: type,
+        text: text,
+        createdAt: DateTime(2026, 8, 26, 15),
+        user: user ?? otherUser,
+        state: state,
+        replyCount: replyCount,
+        attachments: attachments,
+        mentionedUsers: mentionedUsers,
+        messageTextUpdatedAt: messageTextUpdatedAt,
+      );
+    }
+
+    // What a screen reader walking the row would read out, in order.
+    List<String> labelsOf(WidgetTester tester) {
+      return tester.semantics.simulatedAccessibilityTraversal().map((it) => it.label).toList();
+    }
+
+    testWidgets('own message announces the outgoing label', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(user: currentUser),
+          alignment: StreamMessageAlignment.end,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester), contains('OUT:Are we still meeting tomorrow, AT-TIME'));
+
+      handle.dispose();
+    });
+
+    testWidgets('incoming message announces the sender name', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildScene(message()));
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester), contains('IN:Han Solo:Are we still meeting tomorrow, AT-TIME'));
+
+      handle.dispose();
+    });
+
+    testWidgets('announces the sender name exactly once', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildScene(message()));
+      await tester.pumpAndSettle();
+
+      // The footer renders the author name visually; announcing it there as
+      // well would repeat what the row label already said.
+      final withSenderName = labelsOf(tester).where((it) => it.contains('Han Solo'));
+      expect(withSenderName, hasLength(1));
+
+      handle.dispose();
+    });
+
+    testWidgets('does not announce the message text as a separate stop', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildScene(message()));
+      await tester.pumpAndSettle();
+
+      expect(find.bySemanticsLabel('Are we still meeting tomorrow'), findsNothing);
+
+      handle.dispose();
+    });
+
+    testWidgets('announces the edited marker as part of the row label', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildScene(message(messageTextUpdatedAt: DateTime(2026, 8, 26, 16))));
+      await tester.pumpAndSettle();
+
+      expect(
+        labelsOf(tester),
+        contains('IN:Han Solo:Are we still meeting tomorrow, AT-TIME, EDITED'),
+      );
+
+      handle.dispose();
+    });
+
+    testWidgets('announces mentions by display name, not by id', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      final leia = User(id: 'leia-id', name: 'Leia Organa');
+      await tester.pumpWidget(
+        buildScene(message(text: 'Hey @leia-id', mentionedUsers: [leia])),
+      );
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester), contains('IN:Han Solo:Hey @Leia Organa, AT-TIME'));
+
+      handle.dispose();
+    });
+
+    testWidgets('attachment-only message announces the attachment type label', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(
+            text: null,
+            attachments: [Attachment(type: AttachmentType.image, imageUrl: 'https://x.com/a.png')],
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester), contains('IN:Han Solo:Photo, AT-TIME'));
+
+      handle.dispose();
+    });
+
+    testWidgets('own deleted message announces that you deleted it', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(
+            user: currentUser,
+            type: MessageType.deleted,
+            state: MessageState.softDeleted,
+          ),
+          alignment: StreamMessageAlignment.end,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final labels = labelsOf(tester);
+      expect(labels, contains('OUT-DEL:Message deleted, AT-TIME'));
+      // The placeholder inside the bubble would otherwise repeat it.
+      expect(labels.where((it) => it.contains('Message deleted')), hasLength(1));
+      // A deleted message is not something the sender said.
+      expect(labels.where((it) => it.startsWith('OUT:')), isEmpty);
+
+      handle.dispose();
+    });
+
+    testWidgets('incoming deleted message announces who deleted it', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(type: MessageType.deleted, state: MessageState.softDeleted),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final labels = labelsOf(tester);
+      expect(labels, contains('IN-DEL:Han Solo:Message deleted, AT-TIME'));
+      expect(labels.where((it) => it.startsWith('IN:')), isEmpty);
+
+      handle.dispose();
+    });
+
+    testWidgets('semanticsLabel replaces the composed label', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildScene(message(), semanticsLabel: 'CUSTOM'));
+      await tester.pumpAndSettle();
+
+      final labels = labelsOf(tester);
+      expect(labels, contains('CUSTOM'));
+      expect(labels.where((it) => it.startsWith('IN:')), isEmpty);
+
+      handle.dispose();
+    });
+
+    testWidgets('announces one labeled row per platform, in the shipped phrasing', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      // Resolves the real strings rather than the sentinels, so this also pins
+      // what a user actually hears — and it gives the desktop context menu the
+      // action labels it builds itself.
+      await tester.pumpWidget(buildScene(message(), fakeTranslations: false));
+      await tester.pumpAndSettle();
+
+      // On mobile the label merges into the row's tappable node; on desktop and
+      // web nothing inside the row contributes one, so the annotation forms
+      // that node itself. Either way the row is announced exactly once.
+      final announced = labelsOf(tester).where((it) => it.startsWith('Han Solo said, '));
+      expect(announced, hasLength(1));
+      expect(announced.single, startsWith('Han Solo said, Are we still meeting tomorrow, '));
+
+      handle.dispose();
+    }, variant: TargetPlatformVariant.all());
+
+    testWidgets('composes the shipped English phrasing for a deleted message', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(
+            user: currentUser,
+            type: MessageType.deleted,
+            state: MessageState.softDeleted,
+          ),
+          alignment: StreamMessageAlignment.end,
+          fakeTranslations: false,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final announced = labelsOf(tester).singleWhere((it) => it.contains('Message deleted'));
+      expect(announced, startsWith('You, Message deleted, '));
+
+      handle.dispose();
+    });
+
+    // Non-regression guards: these pass with and without the row label, and
+    // exist to prove the label did not swallow the stops a screen-reader user
+    // still needs to reach.
+    testWidgets('keeps the thread replies row as its own stop', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildScene(message(replyCount: 3)));
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester), contains('plural:3'));
+
+      handle.dispose();
+    });
+
+    testWidgets('keeps the sending status of an own message as its own stop', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(user: currentUser),
+          alignment: StreamMessageAlignment.end,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(
+        labelsOf(tester),
+        contains(DefaultTranslations.instance.accessibility.messageSentStatusLabel),
+      );
+
+      handle.dispose();
+    });
+  });
+}
diff --git a/packages/stream_chat_localizations/CHANGELOG.md b/packages/stream_chat_localizations/CHANGELOG.md
index 404aae0b92..bb027d6435 100644
--- a/packages/stream_chat_localizations/CHANGELOG.md
+++ b/packages/stream_chat_localizations/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Upcoming
 
+✅ Added
+
+- Added the message-list a11y strings `outgoingMessageLabel` ("You said, …") and `incomingMessageLabel` ("<name> said, …"), used to announce a message's sender and direction, along with `outgoingDeletedMessageLabel` ("You, …") and `incomingDeletedMessageLabel` ("<name>, …") for the deleted-message placeholder. Every supported locale ships a native-language implementation.
+
 🔄 Changed
 
 - Raised minimum Flutter to `>=3.44.0` and Dart SDK to `^3.12.0`.
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
index 063cd39e74..c2918f6887 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
@@ -996,6 +996,18 @@ class _AccessibilityTranslationsCa extends AccessibilityTranslations {
     return senderName ?? 'Missatge';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => 'Has dit, $body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => '$senderName ha dit, $body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => 'Tu, $body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => '$senderName, $body';
+
   @override
   String get pollPreviewLabel => 'Enquesta';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
index d0be1bc668..fb5c565535 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
@@ -994,6 +994,18 @@ class _AccessibilityTranslationsDe extends AccessibilityTranslations {
     return senderName ?? 'Nachricht';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => 'Du hast gesagt, $body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => '$senderName hat gesagt, $body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => 'Du, $body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => '$senderName, $body';
+
   @override
   String get pollPreviewLabel => 'Umfrage';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
index 09caf5330a..e3c2734d8c 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
@@ -994,6 +994,18 @@ class _AccessibilityTranslationsEn extends AccessibilityTranslations {
     return senderName ?? 'Message';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => 'You said, $body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => '$senderName said, $body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => 'You, $body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => '$senderName, $body';
+
   @override
   String get pollPreviewLabel => 'Poll';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
index 2f90d3f4ed..3bccfd54c7 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
@@ -998,6 +998,18 @@ class _AccessibilityTranslationsEs extends AccessibilityTranslations {
     return senderName ?? 'Mensaje';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => 'Dijiste, $body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => '$senderName dijo, $body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => 'Tú, $body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => '$senderName, $body';
+
   @override
   String get pollPreviewLabel => 'Encuesta';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
index 77d17595f4..2f4d4eb721 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
@@ -1000,6 +1000,18 @@ class _AccessibilityTranslationsFr extends AccessibilityTranslations {
     return senderName ?? 'Message';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => 'Vous avez dit, $body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => '$senderName a dit, $body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => 'Vous, $body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => '$senderName, $body';
+
   @override
   String get pollPreviewLabel => 'Sondage';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
index eaaea55d36..cd70dcd27c 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
@@ -995,6 +995,18 @@ class _AccessibilityTranslationsHi extends AccessibilityTranslations {
     return senderName ?? 'संदेश';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => 'आपने कहा, $body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => '$senderName ने कहा, $body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => 'आप, $body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => '$senderName, $body';
+
   @override
   String get pollPreviewLabel => 'पोल';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
index 1510cbab32..62d2834e8e 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
@@ -1008,6 +1008,18 @@ class _AccessibilityTranslationsIt extends AccessibilityTranslations {
     return senderName ?? 'Messaggio';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => 'Hai detto, $body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => '$senderName ha detto, $body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => 'Tu, $body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => '$senderName, $body';
+
   @override
   String get pollPreviewLabel => 'Sondaggio';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
index 3e443c6f05..471c52dd0a 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
@@ -973,6 +973,18 @@ class _AccessibilityTranslationsJa extends AccessibilityTranslations {
     return senderName ?? 'メッセージ';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => '自分のメッセージ、$body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => '$senderNameさんのメッセージ、$body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => '自分、$body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => '$senderNameさん、$body';
+
   @override
   String get pollPreviewLabel => '投票';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
index f22a77c352..ff34d54636 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
@@ -976,6 +976,18 @@ class _AccessibilityTranslationsKo extends AccessibilityTranslations {
     return senderName ?? '메시지';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => '내 메시지, $body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => '$senderName님의 메시지, $body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => '나, $body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => '$senderName님, $body';
+
   @override
   String get pollPreviewLabel => '투표';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
index 180160c55d..d893893160 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
@@ -979,6 +979,18 @@ class _AccessibilityTranslationsNo extends AccessibilityTranslations {
     return senderName ?? 'Melding';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => 'Du sa, $body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => '$senderName sa, $body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => 'Du, $body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => '$senderName, $body';
+
   @override
   String get pollPreviewLabel => 'Avstemning';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
index 5909875c1f..4b934264d1 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
@@ -997,6 +997,18 @@ class _AccessibilityTranslationsPt extends AccessibilityTranslations {
     return senderName ?? 'Mensagem';
   }
 
+  @override
+  String outgoingMessageLabel({required String body}) => 'Você disse, $body';
+
+  @override
+  String incomingMessageLabel({required String senderName, required String body}) => '$senderName disse, $body';
+
+  @override
+  String outgoingDeletedMessageLabel({required String body}) => 'Você, $body';
+
+  @override
+  String incomingDeletedMessageLabel({required String senderName, required String body}) => '$senderName, $body';
+
   @override
   String get pollPreviewLabel => 'Enquete';
 
diff --git a/packages/stream_chat_localizations/test/translations_test.dart b/packages/stream_chat_localizations/test/translations_test.dart
index a763436c90..646861fe53 100644
--- a/packages/stream_chat_localizations/test/translations_test.dart
+++ b/packages/stream_chat_localizations/test/translations_test.dart
@@ -493,6 +493,13 @@ void main() {
       expect(a11y.outgoingMessagePreviewLabel, isNotNull);
       expect(a11y.incomingMessagePreviewLabel(), isNotNull);
       expect(a11y.incomingMessagePreviewLabel(senderName: 'Alice'), isNotNull);
+      expect(a11y.outgoingMessageLabel(body: 'Hello'), isNotNull);
+      expect(a11y.incomingMessageLabel(senderName: 'Alice', body: 'Hello'), isNotNull);
+      expect(a11y.outgoingDeletedMessageLabel(body: 'Message deleted'), isNotNull);
+      expect(
+        a11y.incomingDeletedMessageLabel(senderName: 'Alice', body: 'Message deleted'),
+        isNotNull,
+      );
       expect(a11y.pollPreviewLabel, isNotNull);
       expect(a11y.draftPreviewLabel, isNotNull);
       expect(a11y.systemMessagePreviewLabel, isNotNull);

From 6cede963791bebbcedaf5d31384cb2efe46722b0 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 14:57:25 +0200
Subject: [PATCH 02/22] fix(ui): fold delivery status into the message row
 phrase, fix date divider
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Device testing surfaced two things the first pass got wrong.

The delivery status was a focus stop of its own, so a screen reader user had to
step through a bare "Read" tick to get past a message. It is now appended to
the composed row phrase and the icon is excluded from the semantics tree, so an
own text message is a single stop: "You said, Hello, Today at 3:00 PM, Sent".
All three sibling SDKs do this — SwiftUI hides the indicator and folds the
status into the bubble label, Android merges the icon's leaf description into
the merged row, React Native splices it into the grouped footer element.

StreamDateDivider announced a clock time it never displays: showing
"Yesterday", it announced "Yesterday at 1:06 PM", because StreamTimestamp falls
back to formatRecentDateTime. It now announces the date as shown, and is marked
a header so days can be jumped between. SwiftUI and Android both announce the
date only and both mark the separator a heading; React Native announces the
date only without the header role.

A deleted message no longer announces a time or a status either: it renders no
footer, so neither is on screen. This is a deliberate divergence — the other
three SDKs do announce a time for deleted messages, but they also still render
a footer for them, so their announcement matches their UI as ours now matches
ours.

Traversal order and the attachment tiles are unchanged: measured, the row
summary is already announced before its parts, and each tile stays reachable
one level deeper, which is the model Android documents and enforces. What is
still missing is labels on those tiles — the image and gallery attachment
widgets emit no semantics at all, so a tile announces nothing.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 packages/stream_chat_flutter/CHANGELOG.md     |  3 +-
 .../components/stream_message_footer.dart     | 18 ++--
 .../message_widget/stream_message_item.dart   | 99 ++++++++++++++++---
 .../lib/src/misc/date_divider.dart            | 75 ++++++++------
 .../stream_message_item_semantics_test.dart   | 22 +++--
 .../test/src/misc/date_divider_test.dart      | 62 ++++++++++++
 6 files changed, 221 insertions(+), 58 deletions(-)

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 7dbd628193..81b2a1517a 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -16,7 +16,8 @@
 
 🐞 Fixed
 
-- Fixed messages announcing only their content: a screen reader now reads each message row as one phrase naming the sender and the direction — "You said, …" for your own messages, "<name> said, …" for everyone else's — followed by the message body, the time it was sent, and the edited marker, while the attachments, reaction chips, quoted message, replies row, and sending status stay individually reachable. A deleted message announces who deleted it in the same way, without the "said" — "You, Message deleted" / "<name>, Message deleted". A custom `messageBuilder` or `StreamMessageItem` component builder replaces the default layout and is responsible for its own label.
+- Fixed messages announcing only their content: a screen reader now reads each message row as one phrase naming the sender and the direction — "You said, …" for your own messages, "<name> said, …" for everyone else's — followed by the message body, the time it was sent, and the edited marker, while the attachments, reaction chips, quoted message, and replies row stay individually reachable one level deeper. The delivery status is announced as part of that phrase rather than costing a focus stop of its own. A deleted message announces who deleted it in the same way, without the "said" — "You, Message deleted" / "<name>, Message deleted". A custom `messageBuilder` or `StreamMessageItem` component builder replaces the default layout and is responsible for its own label.
+- Fixed `StreamDateDivider` announcing a clock time it never displays — a divider reading "Yesterday" announced "Yesterday at 1:06 PM". It now announces the date exactly as shown, never uppercased (some screen readers spell all-caps words out letter by letter), and is exposed as a header so a screen reader can jump from day to day instead of swiping through every message in between.
 - Fixed a crash on web when the message list rebuilt while messages were selectable, for example after opening the attachment picker.
 - Fixed the browser's native context menu reappearing over the message context menu on web after scrolling messages out of view or deleting one.
 - Fixed the SDK re-enabling the browser's native context menu on web in apps that had disabled it themselves.
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
index 4df890c858..ced8bbcc24 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
@@ -66,12 +66,11 @@ class StreamMessageFooterProps {
 ///  * **Timestamp** — always shown, formatted as a short time string.
 ///  * **Edited label** — when the message text has been updated.
 ///
-/// The username, timestamp, and edited label are excluded from the semantics
-/// tree: [DefaultStreamMessageItem] speaks them as part of its composed row
-/// label, so announcing them here as well would add three extra focus stops
-/// per message. Only the sending status contributes a node of its own, because
-/// it tracks the channel read state live. A custom message layout that uses
-/// this footer without a row-level label should re-expose them.
+/// None of the four contributes to the semantics tree:
+/// [DefaultStreamMessageItem] speaks them all as part of its composed row
+/// label, so announcing them here as well would cost four extra focus stops
+/// per message that repeat what the row already said. A custom message layout
+/// that uses this footer without a row-level label should re-expose them.
 class DefaultStreamMessageFooter extends StatelessWidget {
   /// Creates a default message footer with the given [props].
   const DefaultStreamMessageFooter({super.key, required this.props});
@@ -94,7 +93,12 @@ class DefaultStreamMessageFooter extends StatelessWidget {
 
     Widget? statusWidget;
     if (message.user case final user? when user.id == currentUser?.id) {
-      statusWidget = StreamMessageSendingStatus(message: message);
+      // [DefaultStreamMessageItem] appends the delivery status to its composed
+      // row label, so the icon here would otherwise cost a second focus stop
+      // that announces nothing the row has not already said.
+      statusWidget = ExcludeSemantics(
+        child: StreamMessageSendingStatus(message: message),
+      );
     }
 
     final Widget timestampWidget;
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 807697847a..20be3487a6 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -631,19 +631,9 @@ class DefaultStreamMessageItem extends StatelessWidget {
             child: MouseRegion(child: child),
           );
         },
-        child: Semantics(
+        child: _MessageRowSemantics(
+          message: message,
           label: effectiveSemanticsLabel,
-          // `container` stays false so the label merges into the row's own
-          // tappable node instead of adding a second, wordless stop on top of
-          // it. Where nothing inside the row contributes a node — desktop and
-          // web, or a row whose tap and long-press callbacks are both null —
-          // this annotation forms that single node itself.
-          //
-          // `explicitChildNodes` keeps the parts a screen reader must still
-          // reach on their own — the attachments, the reaction chips, the
-          // quoted message, the replies row, the sending status — as separate
-          // nodes instead of folding them into the row phrase.
-          explicitChildNodes: true,
           child: Align(
             alignment: StreamMessageLayout.alignmentDirectionalOf(context),
             child: Padding(
@@ -688,6 +678,11 @@ class DefaultStreamMessageItem extends StatelessWidget {
     final translations = context.translations;
     final currentUser = StreamChat.maybeOf(context)?.currentUser;
 
+    // A deleted message drops the footer altogether, so there is no timestamp
+    // and no edited marker on screen to announce. Inventing them here would
+    // make the announcement disagree with what is rendered.
+    if (message.isDeleted) return _senderAwareBody(context, message, currentUser);
+
     final parts = [
       _senderAwareBody(context, message, currentUser),
       translations.accessibility.formatRecentDateTime(message.createdAt.toLocal()),
@@ -1283,6 +1278,86 @@ class _StreamMessageItemDefaults extends core.StreamMessageItemThemeData {
   );
 }
 
+/// Annotates a message row with its composed screen-reader label.
+///
+/// The label is applied with `container: false` so it merges into the row's own
+/// tappable node instead of adding a second, wordless stop on top of it. Where
+/// nothing inside the row contributes a node — desktop and web, or a row whose
+/// tap and long-press callbacks are both null — this annotation forms that
+/// single node itself.
+///
+/// `explicitChildNodes` keeps the parts a screen reader must still be able to
+/// reach on their own — the attachments, the reaction chips, the quoted
+/// message, the replies row — as separate nodes rather than folding them into
+/// the row phrase.
+///
+/// For the current user's own messages the delivery status is appended to the
+/// label, tracking [ChannelClientState.readStream] so it stays in step with
+/// the icon in the footer. The icon itself is excluded from the semantics tree
+/// (see [DefaultStreamMessageFooter]), so the status is announced as part of
+/// the row instead of costing a focus stop of its own.
+class _MessageRowSemantics extends StatelessWidget {
+  const _MessageRowSemantics({
+    required this.message,
+    required this.label,
+    required this.child,
+  });
+
+  final Message message;
+  final String? label;
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    final currentUser = StreamChat.maybeOf(context)?.currentUser;
+    final isOwnMessage = message.user?.id == currentUser?.id;
+
+    // Only the sender sees a delivery status, and a row with no label of its
+    // own has nothing to append it to.
+    if (!isOwnMessage || label == null) {
+      return Semantics(label: label, explicitChildNodes: true, child: child);
+    }
+
+    final channel = StreamChannel.maybeOf(context)?.channel;
+
+    return BetterStreamBuilder<List<Read>>(
+      stream: channel?.state?.readStream,
+      initialData: channel?.state?.read,
+      builder: (context, data) => Semantics(
+        label: [
+          label,
+          ?_statusLabel(
+            context,
+            isMessageRead: data.readsOf(message: message).isNotEmpty,
+            isMessageDelivered: data.deliveriesOf(message: message).isNotEmpty,
+          ),
+        ].join(', '),
+        explicitChildNodes: true,
+        child: child,
+      ),
+    );
+  }
+
+  // Mirrors the icon [StreamSendingIndicator] picks for the same state, so the
+  // announcement and the visible check marks never disagree.
+  String? _statusLabel(
+    BuildContext context, {
+    required bool isMessageRead,
+    required bool isMessageDelivered,
+  }) {
+    // A deleted message shows no footer, so it has no delivery status either.
+    if (message.isDeleted) return null;
+
+    final a11y = context.translations.accessibility;
+
+    if (isMessageRead) return a11y.messageReadStatusLabel;
+    if (isMessageDelivered) return a11y.messageDeliveredStatusLabel;
+    if (message.state.isCompleted) return a11y.messageSentStatusLabel;
+    if (message.state.isOutgoing) return a11y.messageSendingStatusLabel;
+    return null;
+  }
+}
+
 StreamMention? _buildMention(Message message, core.StreamMentionType type, String id) {
   return switch (type) {
     .user => message.mentionedUsers.firstWhereOrNull((u) => u.id == id)?.let((user) => StreamUserMention(user: user)),
diff --git a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart
index 5ca79da1cc..e631bd6702 100644
--- a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart
+++ b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart
@@ -119,39 +119,56 @@ class StreamDateDivider extends StatelessWidget {
     final effectiveBackgroundColor = backgroundColor ?? colorScheme.backgroundSurfaceSubtle;
     final effectiveBorderRadius = borderRadius ?? BorderRadius.all(radius.max);
 
-    return Center(
-      child: Container(
-        margin: effectiveMargin,
-        decoration: BoxDecoration(
-          color: effectiveBackgroundColor,
-          borderRadius: effectiveBorderRadius,
-        ),
-        child: Padding(
-          padding: effectiveContentPadding,
-          child: StreamTimestamp(
-            date: dateTime.toLocal(),
-            style: effectiveTextStyle,
-            formatter: (context, date) {
-              if (formatter case final formatter?) {
-                final timestamp = formatter.call(context, date);
-                if (uppercase) return timestamp.toUpperCase();
-                return timestamp;
-              }
-
-              final timestamp = switch (date) {
-                _ when date.isToday => context.translations.todayLabel,
-                _ when date.isYesterday => context.translations.yesterdayLabel,
-                _ when date.isWithinLastWeek => Jiffy.parseFromDateTime(date).EEEE,
-                _ when date.isInSameYear => Jiffy.parseFromDateTime(date).MMMd,
-                _ => Jiffy.parseFromDateTime(date).yMMMd,
-              };
+    final localDate = dateTime.toLocal();
 
-              if (uppercase) return timestamp.toUpperCase();
-              return timestamp;
-            },
+    return MergeSemantics(
+      // A date divider separates the list by day, so it doubles as a landmark:
+      // marking it a header lets a screen reader jump from day to day instead
+      // of swiping through every message in between.
+      child: Semantics(
+        header: true,
+        child: Center(
+          child: Container(
+            margin: effectiveMargin,
+            decoration: BoxDecoration(
+              color: effectiveBackgroundColor,
+              borderRadius: effectiveBorderRadius,
+            ),
+            child: Padding(
+              padding: effectiveContentPadding,
+              child: StreamTimestamp(
+                date: localDate,
+                style: effectiveTextStyle,
+                // The divider shows a date, never a clock time. Left to its
+                // default, [StreamTimestamp] would announce
+                // `formatRecentDateTime`'s "Yesterday at 1:06 PM" and invent a
+                // time that is nowhere on screen. Announce the date as shown —
+                // but never uppercased, which some screen readers spell out.
+                semanticsLabel: _formatDate(context, localDate),
+                formatter: (context, date) {
+                  final timestamp = _formatDate(context, date);
+                  if (uppercase) return timestamp.toUpperCase();
+                  return timestamp;
+                },
+              ),
+            ),
           ),
         ),
       ),
     );
   }
+
+  // The visible date label: the caller's [formatter] when given, otherwise a
+  // relative-day phrasing that degrades to an absolute date.
+  String _formatDate(BuildContext context, DateTime date) {
+    if (formatter case final formatter?) return formatter.call(context, date);
+
+    return switch (date) {
+      _ when date.isToday => context.translations.todayLabel,
+      _ when date.isYesterday => context.translations.yesterdayLabel,
+      _ when date.isWithinLastWeek => Jiffy.parseFromDateTime(date).EEEE,
+      _ when date.isInSameYear => Jiffy.parseFromDateTime(date).MMMd,
+      _ => Jiffy.parseFromDateTime(date).yMMMd,
+    };
+  }
 }
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index 3f3b896afd..042c113d42 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -174,7 +174,7 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      expect(labelsOf(tester), contains('OUT:Are we still meeting tomorrow, AT-TIME'));
+      expect(labelsOf(tester), contains('OUT:Are we still meeting tomorrow, AT-TIME, Sent'));
 
       handle.dispose();
     });
@@ -277,7 +277,9 @@ void main() {
       await tester.pumpAndSettle();
 
       final labels = labelsOf(tester);
-      expect(labels, contains('OUT-DEL:Message deleted, AT-TIME'));
+      // No timestamp: a deleted message renders no footer, so announcing one
+      // would describe something that is not on screen.
+      expect(labels, contains('OUT-DEL:Message deleted'));
       // The placeholder inside the bubble would otherwise repeat it.
       expect(labels.where((it) => it.contains('Message deleted')), hasLength(1));
       // A deleted message is not something the sender said.
@@ -297,7 +299,7 @@ void main() {
       await tester.pumpAndSettle();
 
       final labels = labelsOf(tester);
-      expect(labels, contains('IN-DEL:Han Solo:Message deleted, AT-TIME'));
+      expect(labels, contains('IN-DEL:Han Solo:Message deleted'));
       expect(labels.where((it) => it.startsWith('IN:')), isEmpty);
 
       handle.dispose();
@@ -352,7 +354,7 @@ void main() {
       await tester.pumpAndSettle();
 
       final announced = labelsOf(tester).singleWhere((it) => it.contains('Message deleted'));
-      expect(announced, startsWith('You, Message deleted, '));
+      expect(announced, 'You, Message deleted');
 
       handle.dispose();
     });
@@ -371,7 +373,7 @@ void main() {
       handle.dispose();
     });
 
-    testWidgets('keeps the sending status of an own message as its own stop', (tester) async {
+    testWidgets('folds the sending status into the row label', (tester) async {
       final handle = tester.ensureSemantics();
 
       await tester.pumpWidget(
@@ -382,10 +384,12 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      expect(
-        labelsOf(tester),
-        contains(DefaultTranslations.instance.accessibility.messageSentStatusLabel),
-      );
+      final status = DefaultTranslations.instance.accessibility.messageSentStatusLabel;
+      final labels = labelsOf(tester);
+
+      // The status rides on the row phrase rather than costing a focus stop of
+      // its own — an own text message is a single stop.
+      expect(labels.single, endsWith(', $status'));
 
       handle.dispose();
     });
diff --git a/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart b/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart
index a9eb6fb83a..3ab1b885fb 100644
--- a/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart
+++ b/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart
@@ -118,4 +118,66 @@ void main() {
       expect(find.text('custom format'), findsNothing);
     },
   );
+
+  group('semantics', () {
+    Widget buildDivider({required DateTime date, bool uppercase = false}) {
+      final client = MockClient();
+      final clientState = MockClientState();
+
+      when(() => client.state).thenReturn(clientState);
+      when(() => clientState.currentUser).thenReturn(OwnUser(id: 'user-id'));
+
+      return MaterialApp(
+        home: StreamChat(
+          client: client,
+          child: Scaffold(
+            body: StreamDateDivider(dateTime: date, uppercase: uppercase),
+          ),
+        ),
+      );
+    }
+
+    testWidgets('announces the date it shows, without a time', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildDivider(date: DateTime.now()));
+      await tester.pumpAndSettle();
+
+      final node = tester.semantics.find(find.byType(StreamDateDivider));
+      expect(node.label, 'Today');
+      // Left to its default, StreamTimestamp would announce
+      // `formatRecentDateTime`'s "Today at 3:00 PM" and invent a clock time
+      // that the divider never shows.
+      expect(node.label, isNot(contains('at')));
+
+      handle.dispose();
+    });
+
+    testWidgets('is exposed as a header so days can be jumped between', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildDivider(date: DateTime.now()));
+      await tester.pumpAndSettle();
+
+      expect(
+        tester.semantics.find(find.byType(StreamDateDivider)),
+        isSemantics(isHeader: true),
+      );
+
+      handle.dispose();
+    });
+
+    testWidgets('announces the date unshouted when displayed uppercase', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildDivider(date: DateTime.now(), uppercase: true));
+      await tester.pumpAndSettle();
+
+      expect(find.text('TODAY'), findsOneWidget);
+      // Some screen readers spell out all-caps words letter by letter.
+      expect(tester.semantics.find(find.byType(StreamDateDivider)).label, 'Today');
+
+      handle.dispose();
+    });
+  });
 }

From 660411e70c57fc21cff7228e7e9df476f309145b Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 15:07:35 +0200
Subject: [PATCH 03/22] fix(ui, localization): label message-list attachment
 tiles for screen readers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Image, video, GIF and gallery attachments in the message list carried no
semantics at all. The tiles were focus stops — they open a preview on tap — but
announced nothing, so a screen-reader user stepping through a message with
photos heard a run of silent stops.

Each tile now announces its type, reusing the labels the composer previews
already use, and within a gallery its position: "Photo, 2 of 5". The position
is what makes otherwise identical thumbnails tellable apart. The "+N" overflow
badge is excluded from the semantics tree — the tiles' "of 5" already says the
gallery holds more than it shows, so the badge would only add a stop reading
"plus 2".

Grounded in the sibling SDKs, which all label their tiles: SwiftUI announces
"Attachment 1. Image from Yoda, sent at 18:45. Activate to open."; Android uses
a leaf "Image attachment" description with an "Open attachment" click label;
React Native uses "Gallery image" with a "Double tap to open" hint. None of the
three announces a total, and SwiftUI's overflow badge is unlabelled — the "of N"
is ours.

Voice recordings, files and link previews are untouched: they render their own
text or interactive controls and already announce something.

Adds `attachmentPositionLabel` with native implementations for all 11 locales.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 packages/stream_chat_flutter/CHANGELOG.md     |   1 +
 .../builder/attachment_widget_builder.dart    |  27 ++++
 .../builder/gallery_attachment_builder.dart   |  42 ++---
 .../builder/giphy_attachment_builder.dart     |  11 +-
 .../builder/image_attachment_builder.dart     |  13 +-
 .../builder/video_attachment_builder.dart     |  11 +-
 .../src/attachment/gallery_attachment.dart    |  23 +--
 .../accessibility_translations.dart           |  13 ++
 .../builder/attachment_semantics_test.dart    | 143 ++++++++++++++++++
 .../stream_chat_localizations/CHANGELOG.md    |   2 +-
 .../lib/src/stream_chat_localizations_ca.dart |   3 +
 .../lib/src/stream_chat_localizations_de.dart |   3 +
 .../lib/src/stream_chat_localizations_en.dart |   3 +
 .../lib/src/stream_chat_localizations_es.dart |   3 +
 .../lib/src/stream_chat_localizations_fr.dart |   3 +
 .../lib/src/stream_chat_localizations_hi.dart |   3 +
 .../lib/src/stream_chat_localizations_it.dart |   3 +
 .../lib/src/stream_chat_localizations_ja.dart |   3 +
 .../lib/src/stream_chat_localizations_ko.dart |   3 +
 .../lib/src/stream_chat_localizations_no.dart |   3 +
 .../lib/src/stream_chat_localizations_pt.dart |   3 +
 .../test/translations_test.dart               |   1 +
 22 files changed, 281 insertions(+), 39 deletions(-)
 create mode 100644 packages/stream_chat_flutter/test/src/attachment/builder/attachment_semantics_test.dart

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 81b2a1517a..af5e784ad9 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -17,6 +17,7 @@
 🐞 Fixed
 
 - Fixed messages announcing only their content: a screen reader now reads each message row as one phrase naming the sender and the direction — "You said, …" for your own messages, "<name> said, …" for everyone else's — followed by the message body, the time it was sent, and the edited marker, while the attachments, reaction chips, quoted message, and replies row stay individually reachable one level deeper. The delivery status is announced as part of that phrase rather than costing a focus stop of its own. A deleted message announces who deleted it in the same way, without the "said" — "You, Message deleted" / "<name>, Message deleted". A custom `messageBuilder` or `StreamMessageItem` component builder replaces the default layout and is responsible for its own label.
+- Fixed image, video, GIF and gallery attachments in the message list announcing nothing: the tiles were focusable — they open a preview on tap — but carried no label at all. Each now announces its type and, within a gallery, its position ("Photo, 2 of 5"), and the "+N" overflow badge no longer adds a stop of its own.
 - Fixed `StreamDateDivider` announcing a clock time it never displays — a divider reading "Yesterday" announced "Yesterday at 1:06 PM". It now announces the date exactly as shown, never uppercased (some screen readers spell all-caps words out letter by letter), and is exposed as a header so a screen reader can jump from day to day instead of swiping through every message in between.
 - Fixed a crash on web when the message list rebuilt while messages were selectable, for example after opening the attachment picker.
 - Fixed the browser's native context menu reappearing over the message context menu on web after scrolling messages out of view or deleting one.
diff --git a/packages/stream_chat_flutter/lib/src/attachment/builder/attachment_widget_builder.dart b/packages/stream_chat_flutter/lib/src/attachment/builder/attachment_widget_builder.dart
index 8cad2cb2f2..4c207d91d3 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/builder/attachment_widget_builder.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/builder/attachment_widget_builder.dart
@@ -13,6 +13,33 @@ part 'video_attachment_builder.dart';
 part 'voice_recording_attachment_playlist_builder.dart';
 part 'poll_attachment_builder.dart';
 
+// Screen-reader label for a media attachment tile.
+//
+// Image, video and giphy tiles render no text of their own, so without this
+// they are focusable — they open a preview on tap — but announce nothing.
+//
+// [index] (0-based) and [total] are announced only for a gallery, where
+// otherwise identical tiles need telling apart. The type label already rides
+// on the message row's own phrase ("Han Solo said, 2 photos, ..."), so the
+// tiles deliberately repeat the type rather than inventing a second summary.
+String _mediaAttachmentSemanticsLabel(
+  BuildContext context,
+  Attachment attachment, {
+  int? index,
+  int? total,
+}) {
+  final a11y = context.translations.accessibility;
+
+  final typeLabel = switch (attachment.type) {
+    AttachmentType.video => a11y.videoAttachmentLabel(title: attachment.title),
+    AttachmentType.giphy => a11y.gifAttachmentLabel,
+    _ => a11y.imageAttachmentLabel(title: attachment.title),
+  };
+
+  if (index == null || total == null || total < 2) return typeLabel;
+  return '$typeLabel, ${a11y.attachmentPositionLabel(index: index + 1, total: total)}';
+}
+
 /// {@template streamAttachmentWidgetTapCallback}
 /// Signature for a function that's called when the user taps on an attachment.
 /// {@endtemplate}
diff --git a/packages/stream_chat_flutter/lib/src/attachment/builder/gallery_attachment_builder.dart b/packages/stream_chat_flutter/lib/src/attachment/builder/gallery_attachment_builder.dart
index 7177fb8687..c6e815ad0c 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/builder/gallery_attachment_builder.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/builder/gallery_attachment_builder.dart
@@ -100,25 +100,33 @@ class GalleryAttachmentBuilder extends StreamAttachmentWidgetBuilder {
             style: .from(padding: .zero),
             child: InkWell(
               onTap: onTap,
-              child: Stack(
-                fit: .expand,
-                alignment: .center,
-                children: [
-                  StreamMediaAttachmentThumbnail(
-                    media: attachment,
-                    fit: BoxFit.cover,
-                  ),
-                  if (attachment.type == .video && attachment.uploadState.isSuccess) ...[
-                    const Center(child: StreamVideoPlayIndicator(size: .lg)),
-                  ] else ...[
-                    Positioned.fill(
-                      child: StreamAttachmentUploadStateBuilder(
-                        message: message,
-                        attachment: attachment,
-                      ),
+              child: Semantics(
+                label: _mediaAttachmentSemanticsLabel(
+                  context,
+                  attachment,
+                  index: index,
+                  total: galleryAttachments.length,
+                ),
+                child: Stack(
+                  fit: .expand,
+                  alignment: .center,
+                  children: [
+                    StreamMediaAttachmentThumbnail(
+                      media: attachment,
+                      fit: BoxFit.cover,
                     ),
+                    if (attachment.type == .video && attachment.uploadState.isSuccess) ...[
+                      const Center(child: StreamVideoPlayIndicator(size: .lg)),
+                    ] else ...[
+                      Positioned.fill(
+                        child: StreamAttachmentUploadStateBuilder(
+                          message: message,
+                          attachment: attachment,
+                        ),
+                      ),
+                    ],
                   ],
-                ],
+                ),
               ),
             ),
           );
diff --git a/packages/stream_chat_flutter/lib/src/attachment/builder/giphy_attachment_builder.dart b/packages/stream_chat_flutter/lib/src/attachment/builder/giphy_attachment_builder.dart
index 8eed7cc485..3c961a45d3 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/builder/giphy_attachment_builder.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/builder/giphy_attachment_builder.dart
@@ -53,10 +53,13 @@ class GiphyAttachmentBuilder extends StreamAttachmentWidgetBuilder {
       style: style,
       child: InkWell(
         onTap: onTap,
-        child: StreamGiphyAttachment(
-          message: message,
-          constraints: constraints,
-          giphy: giphy,
+        child: Semantics(
+          label: _mediaAttachmentSemanticsLabel(context, giphy),
+          child: StreamGiphyAttachment(
+            message: message,
+            constraints: constraints,
+            giphy: giphy,
+          ),
         ),
       ),
     );
diff --git a/packages/stream_chat_flutter/lib/src/attachment/builder/image_attachment_builder.dart b/packages/stream_chat_flutter/lib/src/attachment/builder/image_attachment_builder.dart
index 70cf7279df..cd65ec949e 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/builder/image_attachment_builder.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/builder/image_attachment_builder.dart
@@ -53,10 +53,15 @@ class ImageAttachmentBuilder extends StreamAttachmentWidgetBuilder {
       style: style,
       child: InkWell(
         onTap: onTap,
-        child: StreamImageAttachment(
-          message: message,
-          constraints: constraints,
-          image: image,
+        // Annotates the InkWell's node so the tile announces what it is; the
+        // thumbnail itself renders no text.
+        child: Semantics(
+          label: _mediaAttachmentSemanticsLabel(context, image),
+          child: StreamImageAttachment(
+            message: message,
+            constraints: constraints,
+            image: image,
+          ),
         ),
       ),
     );
diff --git a/packages/stream_chat_flutter/lib/src/attachment/builder/video_attachment_builder.dart b/packages/stream_chat_flutter/lib/src/attachment/builder/video_attachment_builder.dart
index 23d9e81062..1f1b7d1037 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/builder/video_attachment_builder.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/builder/video_attachment_builder.dart
@@ -55,10 +55,13 @@ class VideoAttachmentBuilder extends StreamAttachmentWidgetBuilder {
       style: style,
       child: InkWell(
         onTap: onTap,
-        child: StreamVideoAttachment(
-          message: message,
-          constraints: constraints,
-          video: video,
+        child: Semantics(
+          label: _mediaAttachmentSemanticsLabel(context, video),
+          child: StreamVideoAttachment(
+            message: message,
+            constraints: constraints,
+            video: video,
+          ),
         ),
       ),
     );
diff --git a/packages/stream_chat_flutter/lib/src/attachment/gallery_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/gallery_attachment.dart
index bfb7c4dcb2..748b03718f 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/gallery_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/gallery_attachment.dart
@@ -288,15 +288,20 @@ class DefaultStreamGalleryAttachment extends StatelessWidget {
       children: children,
       overlayBuilder: (context, remaining) {
         return IgnorePointer(
-          child: Material(
-            clipBehavior: .hardEdge,
-            color: colorScheme.backgroundOverlayDark,
-            shape: RoundedSuperellipseBorder(borderRadius: .all(radius.md)),
-            child: Center(
-              child: Text(
-                '+$remaining',
-                style: textTheme.headingLg.copyWith(
-                  color: colorScheme.textOnAccent,
+          // Each tile announces its position ("4 of 6"), which already tells a
+          // screen-reader user that the gallery holds more than it shows. The
+          // badge would only add a second stop reading "plus 2".
+          child: ExcludeSemantics(
+            child: Material(
+              clipBehavior: .hardEdge,
+              color: colorScheme.backgroundOverlayDark,
+              shape: RoundedSuperellipseBorder(borderRadius: .all(radius.md)),
+              child: Center(
+                child: Text(
+                  '+$remaining',
+                  style: textTheme.headingLg.copyWith(
+                    color: colorScheme.textOnAccent,
+                  ),
                 ),
               ),
             ),
diff --git a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
index 9b009aa0c7..969cde23fa 100644
--- a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
+++ b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
@@ -119,6 +119,14 @@ abstract class AccessibilityTranslations {
   /// `title` when set.
   String imageAttachmentLabel({String? title});
 
+  /// The screen-reader position of one attachment within a gallery, e.g.
+  /// `"2 of 5"`.
+  ///
+  /// Combined with the type label as `"Photo, 2 of 5"`. [index] is 1-based.
+  /// Only announced for galleries, where otherwise identical tiles need
+  /// telling apart.
+  String attachmentPositionLabel({required int index, required int total});
+
   /// The tooltip for the play button on a sent voice-recording
   /// attachment.
   String get voiceRecordingPlayTooltip;
@@ -455,6 +463,11 @@ class DefaultAccessibilityTranslations extends AccessibilityTranslations {
     return 'Photo, $title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) {
+    return '$index of $total';
+  }
+
   @override
   String get voiceRecordingPlayTooltip => 'Play';
 
diff --git a/packages/stream_chat_flutter/test/src/attachment/builder/attachment_semantics_test.dart b/packages/stream_chat_flutter/test/src/attachment/builder/attachment_semantics_test.dart
new file mode 100644
index 0000000000..140ebb2846
--- /dev/null
+++ b/packages/stream_chat_flutter/test/src/attachment/builder/attachment_semantics_test.dart
@@ -0,0 +1,143 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+import 'package:stream_chat_flutter/stream_chat_flutter.dart';
+
+import '../../mocks.dart';
+
+void main() {
+  group('media attachment semantics', () {
+    final currentUser = OwnUser(id: 'current-user');
+    final otherUser = User(id: 'other-user', name: 'Han Solo');
+
+    Widget buildScene(Message message) {
+      final client = MockClient();
+      final clientState = MockClientState();
+      final channel = MockChannel();
+      final channelState = MockChannelState();
+
+      when(() => client.state).thenReturn(clientState);
+      when(() => clientState.currentUser).thenReturn(currentUser);
+      when(() => clientState.currentUserStream).thenAnswer((_) => Stream.value(currentUser));
+      when(() => channel.client).thenReturn(client);
+      when(() => channel.state).thenReturn(channelState);
+      when(() => channelState.readStream).thenAnswer((_) => Stream.value(const []));
+
+      return MaterialApp(
+        home: StreamChat(
+          client: client,
+          connectivityStream: Stream.value(const [ConnectivityResult.mobile]),
+          child: StreamChannel(
+            channel: channel,
+            child: Scaffold(
+              body: StreamMessageLayout(
+                data: const StreamMessageLayoutData(),
+                child: StreamMessageItem(message: message),
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    Message message(List<Attachment> attachments, {String? text}) {
+      return Message(
+        id: 'test-message',
+        text: text,
+        createdAt: DateTime(2026, 8, 26, 15),
+        user: otherUser,
+        state: MessageState.sent,
+        attachments: attachments,
+      );
+    }
+
+    Attachment image({String? title}) {
+      return Attachment(
+        type: AttachmentType.image,
+        title: title,
+        imageUrl: 'https://example.com/image.png',
+      );
+    }
+
+    List<String> labelsOf(WidgetTester tester) {
+      return tester.semantics.simulatedAccessibilityTraversal().map((it) => it.label).toList();
+    }
+
+    testWidgets('a single image tile announces its type', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildScene(message([image()], text: 'look')));
+      await tester.pumpAndSettle();
+
+      // Without a label the tile is still focusable — it opens a preview on
+      // tap — but announces nothing at all.
+      final a11y = DefaultTranslations.instance.accessibility;
+      expect(labelsOf(tester), contains(a11y.imageAttachmentLabel()));
+
+      handle.dispose();
+    });
+
+    testWidgets('a titled image tile announces its title', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildScene(message([image(title: 'sunset.png')])));
+      await tester.pumpAndSettle();
+
+      final a11y = DefaultTranslations.instance.accessibility;
+      expect(labelsOf(tester), contains(a11y.imageAttachmentLabel(title: 'sunset.png')));
+
+      handle.dispose();
+    });
+
+    testWidgets('gallery tiles announce their position', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(message([image(), image(title: 'sunset.png'), image()])),
+      );
+      await tester.pumpAndSettle();
+
+      // Otherwise identical thumbnails need telling apart.
+      expect(
+        labelsOf(tester),
+        containsAllInOrder([
+          'Photo, 1 of 3',
+          'Photo, sunset.png, 2 of 3',
+          'Photo, 3 of 3',
+        ]),
+      );
+
+      handle.dispose();
+    });
+
+    testWidgets('the row summary is announced before its tiles', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildScene(message([image(), image()])));
+      await tester.pumpAndSettle();
+
+      final labels = labelsOf(tester);
+      expect(labels.first, startsWith('Han Solo said,'));
+      expect(labels.skip(1), everyElement(startsWith('Photo,')));
+
+      handle.dispose();
+    });
+
+    testWidgets('an over-full gallery does not announce the overflow badge', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(message(List.generate(6, (_) => image()))),
+      );
+      await tester.pumpAndSettle();
+
+      final labels = labelsOf(tester);
+      // Only four tiles are rendered; their "of 6" already says the gallery
+      // holds more, so the "+2" badge would be a second, cryptic stop.
+      expect(labels.where((it) => it.contains('of 6')), hasLength(4));
+      expect(labels, isNot(contains('+2')));
+
+      handle.dispose();
+    });
+  });
+}
diff --git a/packages/stream_chat_localizations/CHANGELOG.md b/packages/stream_chat_localizations/CHANGELOG.md
index bb027d6435..212fa1467f 100644
--- a/packages/stream_chat_localizations/CHANGELOG.md
+++ b/packages/stream_chat_localizations/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ✅ Added
 
-- Added the message-list a11y strings `outgoingMessageLabel` ("You said, …") and `incomingMessageLabel` ("<name> said, …"), used to announce a message's sender and direction, along with `outgoingDeletedMessageLabel` ("You, …") and `incomingDeletedMessageLabel` ("<name>, …") for the deleted-message placeholder. Every supported locale ships a native-language implementation.
+- Added the message-list a11y strings `outgoingMessageLabel` ("You said, …") and `incomingMessageLabel` ("<name> said, …"), used to announce a message's sender and direction, along with `outgoingDeletedMessageLabel` ("You, …") and `incomingDeletedMessageLabel` ("<name>, …") for the deleted-message placeholder. Added `attachmentPositionLabel` ("2 of 5"), announced on gallery attachment tiles. Every supported locale ships a native-language implementation.
 
 🔄 Changed
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
index c2918f6887..5b92a7f584 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
@@ -948,6 +948,9 @@ class _AccessibilityTranslationsCa extends AccessibilityTranslations {
     return 'Foto, $title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) => '$index de $total';
+
   @override
   String get voiceRecordingPlayTooltip => 'Reprodueix';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
index fb5c565535..d472f4ba34 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
@@ -946,6 +946,9 @@ class _AccessibilityTranslationsDe extends AccessibilityTranslations {
     return 'Foto, $title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) => '$index von $total';
+
   @override
   String get voiceRecordingPlayTooltip => 'Abspielen';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
index e3c2734d8c..2a70c3f4b5 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
@@ -946,6 +946,9 @@ class _AccessibilityTranslationsEn extends AccessibilityTranslations {
     return 'Photo, $title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) => '$index of $total';
+
   @override
   String get voiceRecordingPlayTooltip => 'Play';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
index 3bccfd54c7..e93910518b 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
@@ -950,6 +950,9 @@ class _AccessibilityTranslationsEs extends AccessibilityTranslations {
     return 'Foto, $title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) => '$index de $total';
+
   @override
   String get voiceRecordingPlayTooltip => 'Reproducir';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
index 2f4d4eb721..55bfe2103d 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
@@ -952,6 +952,9 @@ class _AccessibilityTranslationsFr extends AccessibilityTranslations {
     return 'Photo, $title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) => '$index sur $total';
+
   @override
   String get voiceRecordingPlayTooltip => 'Lire';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
index cd70dcd27c..2ce619657f 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
@@ -947,6 +947,9 @@ class _AccessibilityTranslationsHi extends AccessibilityTranslations {
     return 'फोटो, $title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) => '$total में से $index';
+
   @override
   String get voiceRecordingPlayTooltip => 'चलाएँ';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
index 62d2834e8e..bd06c43df1 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
@@ -960,6 +960,9 @@ class _AccessibilityTranslationsIt extends AccessibilityTranslations {
     return 'Foto, $title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) => '$index di $total';
+
   @override
   String get voiceRecordingPlayTooltip => 'Riproduci';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
index 471c52dd0a..d0f8d0d679 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
@@ -925,6 +925,9 @@ class _AccessibilityTranslationsJa extends AccessibilityTranslations {
     return '写真、$title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) => '$total件中$index件目';
+
   @override
   String get voiceRecordingPlayTooltip => '再生';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
index ff34d54636..22ce519237 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
@@ -928,6 +928,9 @@ class _AccessibilityTranslationsKo extends AccessibilityTranslations {
     return '사진, $title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) => '$total개 중 $index번째';
+
   @override
   String get voiceRecordingPlayTooltip => '재생';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
index d893893160..4fc56be81a 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
@@ -931,6 +931,9 @@ class _AccessibilityTranslationsNo extends AccessibilityTranslations {
     return 'Foto, $title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) => '$index av $total';
+
   @override
   String get voiceRecordingPlayTooltip => 'Spill av';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
index 4b934264d1..818961e48e 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
@@ -949,6 +949,9 @@ class _AccessibilityTranslationsPt extends AccessibilityTranslations {
     return 'Foto, $title';
   }
 
+  @override
+  String attachmentPositionLabel({required int index, required int total}) => '$index de $total';
+
   @override
   String get voiceRecordingPlayTooltip => 'Reproduzir';
 
diff --git a/packages/stream_chat_localizations/test/translations_test.dart b/packages/stream_chat_localizations/test/translations_test.dart
index 646861fe53..65a2d448fb 100644
--- a/packages/stream_chat_localizations/test/translations_test.dart
+++ b/packages/stream_chat_localizations/test/translations_test.dart
@@ -493,6 +493,7 @@ void main() {
       expect(a11y.outgoingMessagePreviewLabel, isNotNull);
       expect(a11y.incomingMessagePreviewLabel(), isNotNull);
       expect(a11y.incomingMessagePreviewLabel(senderName: 'Alice'), isNotNull);
+      expect(a11y.attachmentPositionLabel(index: 2, total: 5), isNotNull);
       expect(a11y.outgoingMessageLabel(body: 'Hello'), isNotNull);
       expect(a11y.incomingMessageLabel(senderName: 'Alice', body: 'Hello'), isNotNull);
       expect(a11y.outgoingDeletedMessageLabel(body: 'Message deleted'), isNotNull);

From d92411e574f543b8ead56d5e8fc379b2987ad139 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 15:16:54 +0200
Subject: [PATCH 04/22] fix(ui): keep the timestamp and delivery status on a
 deleted message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The deleted branch of StreamMessageContent returned the placeholder bubble on
its own, dropping the header and footer slots the caller passes in. The design
shows a deleted message with its delivery status and timestamp below the
placeholder, exactly like any other message
(Figma node 6371-306190, "Mobile / Message Container – Outgoing", whose message
stack contains the bubble plus a "Message Container / Delivery Status"
instance).

Both slots are now wired through, so the metadata is back on screen. The
screen-reader phrase follows: it announces the time and the status again, which
also puts us back in line with the other SDKs — SwiftUI announces
"You, Message deleted, at 6:45 PM", and Android and React Native both render a
footer for deleted messages too.

This supersedes the earlier decision to drop the time from the announcement.
That was made to match what was rendered; the rendering was the bug.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 packages/stream_chat_flutter/CHANGELOG.md     |  1 +
 .../components/stream_message_content.dart    | 14 ++++++--
 .../message_widget/stream_message_item.dart   |  8 -----
 .../stream_message_content_test.dart          | 34 ++++++++++++++++++-
 .../stream_message_item_semantics_test.dart   | 10 +++---
 5 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index af5e784ad9..17aa1469ad 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -17,6 +17,7 @@
 🐞 Fixed
 
 - Fixed messages announcing only their content: a screen reader now reads each message row as one phrase naming the sender and the direction — "You said, …" for your own messages, "<name> said, …" for everyone else's — followed by the message body, the time it was sent, and the edited marker, while the attachments, reaction chips, quoted message, and replies row stay individually reachable one level deeper. The delivery status is announced as part of that phrase rather than costing a focus stop of its own. A deleted message announces who deleted it in the same way, without the "said" — "You, Message deleted" / "<name>, Message deleted". A custom `messageBuilder` or `StreamMessageItem` component builder replaces the default layout and is responsible for its own label.
+- Fixed a deleted message dropping its metadata: the placeholder was rendered on its own, without the timestamp and delivery status the design shows below it. Both are back, and a screen reader announces them as part of the message phrase.
 - Fixed image, video, GIF and gallery attachments in the message list announcing nothing: the tiles were focusable — they open a preview on tap — but carried no label at all. Each now announces its type and, within a gallery, its position ("Photo, 2 of 5"), and the "+N" overflow badge no longer adds a stop of its own.
 - Fixed `StreamDateDivider` announcing a clock time it never displays — a divider reading "Yesterday" announced "Yesterday at 1:06 PM". It now announces the date exactly as shown, never uppercased (some screen readers spell all-caps words out letter by letter), and is exposed as a header so a screen reader can jump from day to day instead of swiping through every message in between.
 - Fixed a crash on web when the message list rebuilt while messages were selectable, for example after opening the attachment picker.
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
index 124ddd5394..6f1a6dbd4a 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
@@ -165,9 +165,17 @@ class _StreamMessageContentState extends State<StreamMessageContent> {
     final spacing = context.streamSpacing;
     final crossAxisAlignment = core.StreamMessageLayout.crossAxisAlignmentOf(context);
 
-    // [DefaultStreamMessageItem]'s composed row label already speaks the
-    // deleted placeholder; excluding it here keeps the row a single stop.
-    if (widget.message.isDeleted) return const ExcludeSemantics(child: StreamMessageDeleted());
+    // A deleted message keeps its metadata: the design shows the timestamp and
+    // the delivery status below the placeholder, same as any other message.
+    if (widget.message.isDeleted) {
+      return core.StreamMessageContent(
+        header: widget.header,
+        footer: widget.footer,
+        // The composed row label already speaks the placeholder, so announcing
+        // it here as well would repeat it.
+        child: const ExcludeSemantics(child: StreamMessageDeleted()),
+      );
+    }
 
     return core.StreamMessageContent(
       header: widget.header,
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 20be3487a6..55a15cf663 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -678,11 +678,6 @@ class DefaultStreamMessageItem extends StatelessWidget {
     final translations = context.translations;
     final currentUser = StreamChat.maybeOf(context)?.currentUser;
 
-    // A deleted message drops the footer altogether, so there is no timestamp
-    // and no edited marker on screen to announce. Inventing them here would
-    // make the announcement disagree with what is rendered.
-    if (message.isDeleted) return _senderAwareBody(context, message, currentUser);
-
     final parts = [
       _senderAwareBody(context, message, currentUser),
       translations.accessibility.formatRecentDateTime(message.createdAt.toLocal()),
@@ -1345,9 +1340,6 @@ class _MessageRowSemantics extends StatelessWidget {
     required bool isMessageRead,
     required bool isMessageDelivered,
   }) {
-    // A deleted message shows no footer, so it has no delivery status either.
-    if (message.isDeleted) return null;
-
     final a11y = context.translations.accessibility;
 
     if (isMessageRead) return a11y.messageReadStatusLabel;
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_content_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_content_test.dart
index 9c6362fb41..d74c6b5d95 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_content_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_content_test.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat_flutter/src/message_widget/components/stream_message_content.dart';
+import 'package:stream_chat_flutter/src/message_widget/components/stream_message_deleted.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
 // A deterministic attachment renderer so the post-frame width measurement
@@ -62,6 +63,8 @@ Future<void> pumpContent(
   WidgetTester tester, {
   required Message message,
   required Key layoutKey,
+  Widget? header,
+  Widget? footer,
 }) {
   return tester.pumpWidget(
     MaterialApp(
@@ -77,7 +80,11 @@ Future<void> pumpContent(
               body: Center(
                 child: SizedBox(
                   width: 300,
-                  child: StreamMessageContent(message: message),
+                  child: StreamMessageContent(
+                    message: message,
+                    header: header,
+                    footer: footer,
+                  ),
                 ),
               ),
             ),
@@ -171,4 +178,29 @@ void main() {
       );
     },
   );
+
+  // The design shows a deleted message with its timestamp and delivery status
+  // below the placeholder, same as any other message. The deleted branch used
+  // to return the bare bubble and drop both slots.
+  testWidgets('keeps the header and footer slots for a deleted message', (tester) async {
+    final message = Message(
+      id: 'deleted-message',
+      type: MessageType.deleted,
+      state: MessageState.softDeleted,
+      user: User(id: 'u1', name: 'Alice'),
+    );
+
+    await pumpContent(
+      tester,
+      message: message,
+      layoutKey: GlobalKey<_LayoutHolderState>(),
+      header: const Text('HEADER'),
+      footer: const Text('FOOTER'),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.byType(StreamMessageDeleted), findsOneWidget);
+    expect(find.text('FOOTER'), findsOneWidget);
+    expect(find.text('HEADER'), findsOneWidget);
+  });
 }
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index 042c113d42..d5fbbf7fb4 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -277,9 +277,9 @@ void main() {
       await tester.pumpAndSettle();
 
       final labels = labelsOf(tester);
-      // No timestamp: a deleted message renders no footer, so announcing one
-      // would describe something that is not on screen.
-      expect(labels, contains('OUT-DEL:Message deleted'));
+      // A deleted message keeps its footer, so the time and the delivery
+      // status are on screen and belong in the announcement.
+      expect(labels, contains('OUT-DEL:Message deleted, AT-TIME, Sent'));
       // The placeholder inside the bubble would otherwise repeat it.
       expect(labels.where((it) => it.contains('Message deleted')), hasLength(1));
       // A deleted message is not something the sender said.
@@ -299,7 +299,7 @@ void main() {
       await tester.pumpAndSettle();
 
       final labels = labelsOf(tester);
-      expect(labels, contains('IN-DEL:Han Solo:Message deleted'));
+      expect(labels, contains('IN-DEL:Han Solo:Message deleted, AT-TIME'));
       expect(labels.where((it) => it.startsWith('IN:')), isEmpty);
 
       handle.dispose();
@@ -354,7 +354,7 @@ void main() {
       await tester.pumpAndSettle();
 
       final announced = labelsOf(tester).singleWhere((it) => it.contains('Message deleted'));
-      expect(announced, 'You, Message deleted');
+      expect(announced, startsWith('You, Message deleted, '));
 
       handle.dispose();
     });

From 7b614391e2ccf4e37a96959916c5c23c82c6bd90 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 15:49:25 +0200
Subject: [PATCH 05/22] fix(ui): drop the edited marker from a deleted message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A message that was edited and then deleted showed "Message deleted • Edited",
describing history the reader can no longer see. The marker is now suppressed
in the footer, in the composed screen-reader phrase that mirrors it, and in the
metadata-visibility default — an invisible marker should not force the footer
visible on a stacked message.

Both sibling SDKs do the same: SwiftUI guards the label with
`&& !message.isDeleted` (MessageListHelperViews.swift:83) and Android with
`message.messageTextUpdatedAt != null && !message.isDeleted()`
(MessageFooter.kt:81).

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 packages/stream_chat_flutter/CHANGELOG.md     |  2 +-
 .../components/stream_message_footer.dart     |  4 +++-
 .../message_widget/stream_message_item.dart   |  7 +++---
 .../stream_message_item_semantics_test.dart   | 24 +++++++++++++++++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 17aa1469ad..8e70ee9081 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -17,7 +17,7 @@
 🐞 Fixed
 
 - Fixed messages announcing only their content: a screen reader now reads each message row as one phrase naming the sender and the direction — "You said, …" for your own messages, "<name> said, …" for everyone else's — followed by the message body, the time it was sent, and the edited marker, while the attachments, reaction chips, quoted message, and replies row stay individually reachable one level deeper. The delivery status is announced as part of that phrase rather than costing a focus stop of its own. A deleted message announces who deleted it in the same way, without the "said" — "You, Message deleted" / "<name>, Message deleted". A custom `messageBuilder` or `StreamMessageItem` component builder replaces the default layout and is responsible for its own label.
-- Fixed a deleted message dropping its metadata: the placeholder was rendered on its own, without the timestamp and delivery status the design shows below it. Both are back, and a screen reader announces them as part of the message phrase.
+- Fixed a deleted message dropping its metadata: the placeholder was rendered on its own, without the timestamp and delivery status the design shows below it. Both are back, and a screen reader announces them as part of the message phrase. The edited marker is dropped for a deleted message, though — there is no text left to have been edited.
 - Fixed image, video, GIF and gallery attachments in the message list announcing nothing: the tiles were focusable — they open a preview on tap — but carried no label at all. Each now announces its type and, within a gallery, its position ("Photo, 2 of 5"), and the "+N" overflow badge no longer adds a stop of its own.
 - Fixed `StreamDateDivider` announcing a clock time it never displays — a divider reading "Yesterday" announced "Yesterday at 1:06 PM". It now announces the date exactly as shown, never uppercased (some screen readers spell all-caps words out letter by letter), and is exposed as a header so a screen reader can jump from day to day instead of swiping through every message in between.
 - Fixed a crash on web when the message list rebuilt while messages were selectable, for example after opening the attachment picker.
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
index ced8bbcc24..f3308fe0f4 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
@@ -112,7 +112,9 @@ class DefaultStreamMessageFooter extends StatelessWidget {
     }
 
     Widget? editedWidget;
-    if (message.messageTextUpdatedAt != null) {
+    // A deleted message has no text left to have been edited, so the marker
+    // would describe history the reader can no longer see.
+    if (message.messageTextUpdatedAt != null && !message.isDeleted) {
       editedWidget = ExcludeSemantics(
         child: Text(context.translations.editedMessageLabel),
       );
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 55a15cf663..134e562e8d 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -489,7 +489,7 @@ class DefaultStreamMessageItem extends StatelessWidget {
     final defaults = _StreamMessageItemDefaults(
       context,
       isPinned: message.pinned,
-      isEdited: message.messageTextUpdatedAt != null,
+      isEdited: message.messageTextUpdatedAt != null && !message.isDeleted,
       isBouncedWithError: message.isBouncedWithError,
       state: message.state,
     );
@@ -681,7 +681,8 @@ class DefaultStreamMessageItem extends StatelessWidget {
     final parts = [
       _senderAwareBody(context, message, currentUser),
       translations.accessibility.formatRecentDateTime(message.createdAt.toLocal()),
-      if (message.messageTextUpdatedAt != null) translations.editedMessageLabel,
+      // Mirrors the footer, which drops the marker on a deleted message.
+      if (message.messageTextUpdatedAt != null && !message.isDeleted) translations.editedMessageLabel,
     ];
 
     return parts.where((it) => it.isNotEmpty).join(', ');
@@ -953,7 +954,7 @@ class DefaultStreamMessageItem extends StatelessWidget {
     final defaults = _StreamMessageItemDefaults(
       context,
       isPinned: message.pinned,
-      isEdited: message.messageTextUpdatedAt != null,
+      isEdited: message.messageTextUpdatedAt != null && !message.isDeleted,
       state: message.state,
     );
 
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index d5fbbf7fb4..f8bfcf4b12 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -229,6 +229,30 @@ void main() {
       handle.dispose();
     });
 
+    testWidgets('a deleted message shows and announces no edited marker', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(
+            user: currentUser,
+            type: MessageType.deleted,
+            state: MessageState.softDeleted,
+            messageTextUpdatedAt: DateTime(2026, 8, 26, 16),
+          ),
+          alignment: StreamMessageAlignment.end,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      // There is no text left to have been edited, so the marker would
+      // describe history the reader can no longer see.
+      expect(find.text('EDITED'), findsNothing);
+      expect(labelsOf(tester), isNot(contains(contains('EDITED'))));
+
+      handle.dispose();
+    });
+
     testWidgets('announces mentions by display name, not by id', (tester) async {
       final handle = tester.ensureSemantics();
 

From 0f6b347d5bd851bf5d62b51bc0167496f461dbb2 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 16:21:59 +0200
Subject: [PATCH 06/22] fix(ui, localization): announce who replied to whom on
 a quoted message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The quoted-message preview announced only the quoted author's name — "Han
Solo" — leaving a screen-reader user to guess why that name was there and
whose message was being replied to. It now announces the relationship the
preview stands for, merged with the quoted body into one phrase:

  "Han Solo replied to your message, are we still meeting tomorrow"
  "You replied to Leia Organa's message, are we still meeting tomorrow"

This follows Android, which is the only sibling SDK that does this properly —
`QuotedMessage.kt:154-178` picks between `..._replied_to_your_message` and
`..._replied_to_their_message` on whether the *quoted* message is the current
user's, and substitutes "You" for the replier when that is the current user.
The same four-way matrix is implemented here. SwiftUI reads its visible
composer-phrased title ("Reply to Alice") and never says whose message it was;
React Native announces the title only and drops the quoted body entirely.

`StreamQuotedMessageProps` gains `replyMessage`, the message doing the
quoting — the preview needs it to name the replier. It is optional: without it
the preview announces the author's name as before, so a consumer building the
widget directly is unaffected.

Adds `repliedToOwnMessageLabel` / `repliedToMessageLabel`, with native
implementations for all 11 locales. Both names are parameters so each locale
forms the possessive itself.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 packages/stream_chat_flutter/CHANGELOG.md     |   1 +
 .../accessibility_translations.dart           |  33 ++++
 .../components/stream_message_content.dart    |   1 +
 .../message_widget/stream_quoted_message.dart |  57 +++++-
 .../stream_quoted_message_semantics_test.dart | 162 ++++++++++++++++++
 .../stream_chat_localizations/CHANGELOG.md    |   2 +-
 .../lib/src/stream_chat_localizations_ca.dart |   7 +
 .../lib/src/stream_chat_localizations_de.dart |   7 +
 .../lib/src/stream_chat_localizations_en.dart |   7 +
 .../lib/src/stream_chat_localizations_es.dart |   7 +
 .../lib/src/stream_chat_localizations_fr.dart |   7 +
 .../lib/src/stream_chat_localizations_hi.dart |   7 +
 .../lib/src/stream_chat_localizations_it.dart |   7 +
 .../lib/src/stream_chat_localizations_ja.dart |   7 +
 .../lib/src/stream_chat_localizations_ko.dart |   7 +
 .../lib/src/stream_chat_localizations_no.dart |   7 +
 .../lib/src/stream_chat_localizations_pt.dart |   7 +
 .../test/translations_test.dart               |   5 +
 18 files changed, 336 insertions(+), 2 deletions(-)
 create mode 100644 packages/stream_chat_flutter/test/src/message_widget/stream_quoted_message_semantics_test.dart

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 8e70ee9081..73678ab46c 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -18,6 +18,7 @@
 
 - Fixed messages announcing only their content: a screen reader now reads each message row as one phrase naming the sender and the direction — "You said, …" for your own messages, "<name> said, …" for everyone else's — followed by the message body, the time it was sent, and the edited marker, while the attachments, reaction chips, quoted message, and replies row stay individually reachable one level deeper. The delivery status is announced as part of that phrase rather than costing a focus stop of its own. A deleted message announces who deleted it in the same way, without the "said" — "You, Message deleted" / "<name>, Message deleted". A custom `messageBuilder` or `StreamMessageItem` component builder replaces the default layout and is responsible for its own label.
 - Fixed a deleted message dropping its metadata: the placeholder was rendered on its own, without the timestamp and delivery status the design shows below it. Both are back, and a screen reader announces them as part of the message phrase. The edited marker is dropped for a deleted message, though — there is no text left to have been edited.
+- Fixed the quoted-message preview announcing only the quoted author's name, which said nothing about the reply relationship. It now announces who replied to whom — "Han Solo replied to your message" / "You replied to Leia's message" — followed by the quoted body. Pass `replyMessage` when building `StreamQuotedMessage` directly to get the same phrasing.
 - Fixed image, video, GIF and gallery attachments in the message list announcing nothing: the tiles were focusable — they open a preview on tap — but carried no label at all. Each now announces its type and, within a gallery, its position ("Photo, 2 of 5"), and the "+N" overflow badge no longer adds a stop of its own.
 - Fixed `StreamDateDivider` announcing a clock time it never displays — a divider reading "Yesterday" announced "Yesterday at 1:06 PM". It now announces the date exactly as shown, never uppercased (some screen readers spell all-caps words out letter by letter), and is exposed as a header so a screen reader can jump from day to day instead of swiping through every message in between.
 - Fixed a crash on web when the message list rebuilt while messages were selectable, for example after opening the attachment picker.
diff --git a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
index 969cde23fa..ea47e76e0c 100644
--- a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
+++ b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
@@ -119,6 +119,26 @@ abstract class AccessibilityTranslations {
   /// `title` when set.
   String imageAttachmentLabel({String? title});
 
+  /// The screen-reader label for a quoted-message preview whose quoted
+  /// message the current user wrote, e.g. `"Han Solo replied to your
+  /// message"`.
+  ///
+  /// [replierName] is the author of the message doing the quoting, already
+  /// resolved to the word for "you" when that is the current user. Combined
+  /// with the quoted body as `"Han Solo replied to your message, see you
+  /// tomorrow"`.
+  String repliedToOwnMessageLabel({required String replierName});
+
+  /// The screen-reader label for a quoted-message preview whose quoted
+  /// message [authorName] wrote, e.g. `"You replied to Leia's message"`.
+  ///
+  /// See [repliedToOwnMessageLabel] for [replierName]. Both names are part of
+  /// the string so every locale can form the possessive itself.
+  String repliedToMessageLabel({
+    required String replierName,
+    required String authorName,
+  });
+
   /// The screen-reader position of one attachment within a gallery, e.g.
   /// `"2 of 5"`.
   ///
@@ -463,6 +483,19 @@ class DefaultAccessibilityTranslations extends AccessibilityTranslations {
     return 'Photo, $title';
   }
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) {
+    return '$replierName replied to your message';
+  }
+
+  @override
+  String repliedToMessageLabel({
+    required String replierName,
+    required String authorName,
+  }) {
+    return "$replierName replied to $authorName's message";
+  }
+
   @override
   String attachmentPositionLabel({required int index, required int total}) {
     return '$index of $total';
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
index 6f1a6dbd4a..d4fb6d78b6 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
@@ -201,6 +201,7 @@ class _StreamMessageContentState extends State<StreamMessageContent> {
                       if (widget.message.quotedMessage case final quotedMessage?)
                         StreamQuotedMessage(
                           quotedMessage: quotedMessage,
+                          replyMessage: widget.message,
                           onTap: switch (widget.onQuotedMessageTap) {
                             final onTap? => () => onTap(quotedMessage),
                             _ => null,
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart
index 0416d95879..49d6f8b5ee 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart
@@ -2,7 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:stream_chat_flutter/src/attachment/thumbnail/media_attachment_thumbnail.dart';
 import 'package:stream_chat_flutter/src/channel/stream_message_preview_text.dart';
 import 'package:stream_chat_flutter/src/components/stream_chat_component_builders.dart';
+import 'package:stream_chat_flutter/src/stream_chat.dart';
 import 'package:stream_chat_flutter/src/theme/quoted_message_theme.dart';
+import 'package:stream_chat_flutter/src/utils/extensions.dart';
 import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
 import 'package:stream_core_flutter/chat.dart';
 
@@ -38,10 +40,12 @@ class StreamQuotedMessage extends StatelessWidget {
   StreamQuotedMessage({
     super.key,
     required Message quotedMessage,
+    Message? replyMessage,
     BoxConstraints? constraints,
     VoidCallback? onTap,
   }) : props = .new(
          quotedMessage: quotedMessage,
+         replyMessage: replyMessage,
          constraints: constraints,
          onTap: onTap,
        );
@@ -70,6 +74,7 @@ class StreamQuotedMessageProps {
   /// Creates properties for a quoted-message preview.
   const StreamQuotedMessageProps({
     required this.quotedMessage,
+    this.replyMessage,
     this.constraints,
     this.onTap,
   });
@@ -77,6 +82,17 @@ class StreamQuotedMessageProps {
   /// The message being quoted.
   final Message quotedMessage;
 
+  /// The message doing the quoting.
+  ///
+  /// Only used to describe the preview to a screen reader — who replied, and
+  /// whether they replied to the current user's message
+  /// ("Han Solo replied to your message") or to someone else's
+  /// ("You replied to Leia's message").
+  ///
+  /// When null, the preview falls back to announcing the quoted author's name
+  /// on its own, which says nothing about the reply relationship.
+  final Message? replyMessage;
+
   /// The constraints to use when displaying the preview.
   final BoxConstraints? constraints;
 
@@ -111,6 +127,38 @@ class DefaultStreamQuotedMessage extends StatelessWidget {
   /// The properties that configure this widget.
   final StreamQuotedMessageProps props;
 
+  // Describes the reply relationship the preview stands for: who replied, and
+  // whose message they replied to. Returns null when there is no replying
+  // message to attribute, leaving the author's name to be announced as shown.
+  String? _semanticsLabel(BuildContext context) {
+    final replyMessage = props.replyMessage;
+    if (replyMessage == null) return null;
+
+    final translations = context.translations;
+    final a11y = translations.accessibility;
+    final currentUser = StreamChat.maybeOf(context)?.currentUser;
+
+    final replier = switch (replyMessage.user) {
+      final user? when user.id == currentUser?.id => translations.youText,
+      final user? when user.name.trim().isNotEmpty => user.name.trim(),
+      _ => null,
+    };
+
+    if (replier == null) return null;
+
+    final quotedAuthor = props.quotedMessage.user;
+    if (quotedAuthor == null) return null;
+
+    if (quotedAuthor.id == currentUser?.id) {
+      return a11y.repliedToOwnMessageLabel(replierName: replier);
+    }
+
+    final authorName = quotedAuthor.name.trim();
+    if (authorName.isEmpty) return null;
+
+    return a11y.repliedToMessageLabel(replierName: replier, authorName: authorName);
+  }
+
   @override
   Widget build(BuildContext context) {
     final quotedMessage = props.quotedMessage;
@@ -142,7 +190,14 @@ class DefaultStreamQuotedMessage extends StatelessWidget {
       style: effectiveTitleTextStyle,
       maxLines: 1,
       overflow: TextOverflow.ellipsis,
-      child: Text(quotedMessage.user?.name ?? ''),
+      // The visible title is just the quoted author's name, which leaves a
+      // screen reader to guess at the relationship. Announcing who replied to
+      // whom instead turns the preview into a sentence; it merges with the
+      // body preview below into one phrase.
+      child: Text(
+        quotedMessage.user?.name ?? '',
+        semanticsLabel: _semanticsLabel(context),
+      ),
     );
 
     final effectiveSubtitle = DefaultTextStyle.merge(
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_quoted_message_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_quoted_message_semantics_test.dart
new file mode 100644
index 0000000000..e6c08e5595
--- /dev/null
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_quoted_message_semantics_test.dart
@@ -0,0 +1,162 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+import 'package:stream_chat_flutter/stream_chat_flutter.dart';
+
+import '../mocks.dart';
+
+void main() {
+  group('StreamQuotedMessage reply attribution', () {
+    final currentUser = OwnUser(id: 'me', name: 'Luke Skywalker');
+    final han = User(id: 'han', name: 'Han Solo');
+    final leia = User(id: 'leia', name: 'Leia Organa');
+
+    const quotedText = 'are we still meeting tomorrow';
+
+    Widget wrap(Widget body) {
+      final client = MockClient();
+      final clientState = MockClientState();
+      final channel = MockChannel();
+      final channelState = MockChannelState();
+
+      when(() => client.state).thenReturn(clientState);
+      when(() => clientState.currentUser).thenReturn(currentUser);
+      when(() => clientState.currentUserStream).thenAnswer((_) => Stream.value(currentUser));
+      when(() => channel.client).thenReturn(client);
+      when(() => channel.state).thenReturn(channelState);
+      when(() => channelState.readStream).thenAnswer((_) => Stream.value(const []));
+
+      return MaterialApp(
+        home: StreamChat(
+          client: client,
+          connectivityStream: Stream.value(const [ConnectivityResult.mobile]),
+          child: StreamChannel(
+            channel: channel,
+            child: Scaffold(
+              body: StreamMessageLayout(
+                data: const StreamMessageLayoutData(),
+                child: Align(alignment: Alignment.topLeft, child: body),
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    Widget buildScene(Message message) => wrap(StreamMessageItem(message: message));
+
+    Message reply({required User by, required User to}) {
+      return Message(
+        id: 'reply',
+        text: 'sure thing',
+        createdAt: DateTime(2026, 8, 26, 15),
+        user: by,
+        state: MessageState.sent,
+        quotedMessage: Message(
+          id: 'quoted',
+          text: quotedText,
+          createdAt: DateTime(2026, 8, 26, 14),
+          user: to,
+          state: MessageState.sent,
+        ),
+      );
+    }
+
+    // The label the quoted preview contributes, merged with the body preview
+    // below it into a single focus stop.
+    Future<String> quotedLabel(WidgetTester tester, Message message) async {
+      await tester.pumpWidget(buildScene(message));
+      await tester.pumpAndSettle();
+
+      return tester.semantics
+          .simulatedAccessibilityTraversal()
+          .map((it) => it.label)
+          .singleWhere((it) => it.contains(quotedText));
+    }
+
+    testWidgets('someone replying to the current user names their message', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      final label = await quotedLabel(tester, reply(by: han, to: currentUser));
+
+      // Without this the preview announced only "Han Solo", saying nothing
+      // about who was replied to.
+      expect(label, startsWith('Han Solo replied to your message'));
+      expect(label, contains(quotedText));
+
+      handle.dispose();
+    });
+
+    testWidgets('the current user replying to someone names that someone', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      final label = await quotedLabel(tester, reply(by: currentUser, to: leia));
+
+      expect(label, startsWith("You replied to Leia Organa's message"));
+
+      handle.dispose();
+    });
+
+    testWidgets('a reply between two other people names both', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      final label = await quotedLabel(tester, reply(by: han, to: leia));
+
+      expect(label, startsWith("Han Solo replied to Leia Organa's message"));
+
+      handle.dispose();
+    });
+
+    testWidgets('the current user replying to themselves', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      final label = await quotedLabel(tester, reply(by: currentUser, to: currentUser));
+
+      expect(label, startsWith('You replied to your message'));
+
+      handle.dispose();
+    });
+
+    testWidgets('the quoted preview stays a stop of its own', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(buildScene(reply(by: han, to: currentUser)));
+      await tester.pumpAndSettle();
+
+      final labels = tester.semantics.simulatedAccessibilityTraversal().map((it) => it.label).toList();
+
+      // The row phrase comes first, the quote is reachable one level deeper
+      // and can be activated to jump to the original.
+      expect(labels.first, startsWith('Han Solo said, sure thing'));
+      expect(labels[1], startsWith('Han Solo replied to your message'));
+
+      handle.dispose();
+    });
+
+    testWidgets('falls back to the author name without a replying message', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      // A consumer building the preview directly gets today's behaviour.
+      await tester.pumpWidget(
+        wrap(
+          StreamQuotedMessage(
+            quotedMessage: Message(
+              id: 'quoted',
+              text: quotedText,
+              createdAt: DateTime(2026, 8, 26, 14),
+              user: leia,
+              state: MessageState.sent,
+            ),
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.text('Leia Organa'), findsOneWidget);
+      final labels = tester.semantics.simulatedAccessibilityTraversal().map((it) => it.label).toList();
+      expect(labels.where((it) => it.contains('replied to')), isEmpty);
+
+      handle.dispose();
+    });
+  });
+}
diff --git a/packages/stream_chat_localizations/CHANGELOG.md b/packages/stream_chat_localizations/CHANGELOG.md
index 212fa1467f..f110926224 100644
--- a/packages/stream_chat_localizations/CHANGELOG.md
+++ b/packages/stream_chat_localizations/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ✅ Added
 
-- Added the message-list a11y strings `outgoingMessageLabel` ("You said, …") and `incomingMessageLabel` ("<name> said, …"), used to announce a message's sender and direction, along with `outgoingDeletedMessageLabel` ("You, …") and `incomingDeletedMessageLabel` ("<name>, …") for the deleted-message placeholder. Added `attachmentPositionLabel` ("2 of 5"), announced on gallery attachment tiles. Every supported locale ships a native-language implementation.
+- Added the message-list a11y strings `outgoingMessageLabel` ("You said, …") and `incomingMessageLabel` ("<name> said, …"), used to announce a message's sender and direction, along with `outgoingDeletedMessageLabel` ("You, …") and `incomingDeletedMessageLabel` ("<name>, …") for the deleted-message placeholder. Added `attachmentPositionLabel` ("2 of 5"), announced on gallery attachment tiles, and `repliedToOwnMessageLabel` / `repliedToMessageLabel` for the quoted-message preview. Every supported locale ships a native-language implementation.
 
 🔄 Changed
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
index 5b92a7f584..cf1eb9b702 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
@@ -951,6 +951,13 @@ class _AccessibilityTranslationsCa extends AccessibilityTranslations {
   @override
   String attachmentPositionLabel({required int index, required int total}) => '$index de $total';
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) => '$replierName ha respost al teu missatge';
+
+  @override
+  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+      '$replierName ha respost al missatge de $authorName';
+
   @override
   String get voiceRecordingPlayTooltip => 'Reprodueix';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
index d472f4ba34..93cb1063da 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
@@ -949,6 +949,13 @@ class _AccessibilityTranslationsDe extends AccessibilityTranslations {
   @override
   String attachmentPositionLabel({required int index, required int total}) => '$index von $total';
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) => '$replierName hat auf deine Nachricht geantwortet';
+
+  @override
+  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+      '$replierName hat auf die Nachricht von $authorName geantwortet';
+
   @override
   String get voiceRecordingPlayTooltip => 'Abspielen';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
index 2a70c3f4b5..29b749f82a 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
@@ -949,6 +949,13 @@ class _AccessibilityTranslationsEn extends AccessibilityTranslations {
   @override
   String attachmentPositionLabel({required int index, required int total}) => '$index of $total';
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) => '$replierName replied to your message';
+
+  @override
+  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+      "$replierName replied to $authorName's message";
+
   @override
   String get voiceRecordingPlayTooltip => 'Play';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
index e93910518b..78d52456b9 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
@@ -953,6 +953,13 @@ class _AccessibilityTranslationsEs extends AccessibilityTranslations {
   @override
   String attachmentPositionLabel({required int index, required int total}) => '$index de $total';
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) => '$replierName respondió a tu mensaje';
+
+  @override
+  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+      '$replierName respondió al mensaje de $authorName';
+
   @override
   String get voiceRecordingPlayTooltip => 'Reproducir';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
index 55bfe2103d..41e01c0e18 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
@@ -955,6 +955,13 @@ class _AccessibilityTranslationsFr extends AccessibilityTranslations {
   @override
   String attachmentPositionLabel({required int index, required int total}) => '$index sur $total';
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) => '$replierName a répondu à votre message';
+
+  @override
+  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+      '$replierName a répondu au message de $authorName';
+
   @override
   String get voiceRecordingPlayTooltip => 'Lire';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
index 2ce619657f..7ba242c653 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
@@ -950,6 +950,13 @@ class _AccessibilityTranslationsHi extends AccessibilityTranslations {
   @override
   String attachmentPositionLabel({required int index, required int total}) => '$total में से $index';
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) => '$replierName ने आपके संदेश का उत्तर दिया';
+
+  @override
+  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+      '$replierName ने $authorName के संदेश का उत्तर दिया';
+
   @override
   String get voiceRecordingPlayTooltip => 'चलाएँ';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
index bd06c43df1..3d6f487110 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
@@ -963,6 +963,13 @@ class _AccessibilityTranslationsIt extends AccessibilityTranslations {
   @override
   String attachmentPositionLabel({required int index, required int total}) => '$index di $total';
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) => '$replierName ha risposto al tuo messaggio';
+
+  @override
+  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+      '$replierName ha risposto al messaggio di $authorName';
+
   @override
   String get voiceRecordingPlayTooltip => 'Riproduci';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
index d0f8d0d679..a819b85838 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
@@ -928,6 +928,13 @@ class _AccessibilityTranslationsJa extends AccessibilityTranslations {
   @override
   String attachmentPositionLabel({required int index, required int total}) => '$total件中$index件目';
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) => '$replierNameがあなたのメッセージに返信しました';
+
+  @override
+  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+      '$replierNameが$authorNameのメッセージに返信しました';
+
   @override
   String get voiceRecordingPlayTooltip => '再生';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
index 22ce519237..52587502ca 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
@@ -931,6 +931,13 @@ class _AccessibilityTranslationsKo extends AccessibilityTranslations {
   @override
   String attachmentPositionLabel({required int index, required int total}) => '$total개 중 $index번째';
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) => '$replierName님이 내 메시지에 답장했습니다';
+
+  @override
+  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+      '$replierName님이 $authorName님의 메시지에 답장했습니다';
+
   @override
   String get voiceRecordingPlayTooltip => '재생';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
index 4fc56be81a..aa0dee4b13 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
@@ -934,6 +934,13 @@ class _AccessibilityTranslationsNo extends AccessibilityTranslations {
   @override
   String attachmentPositionLabel({required int index, required int total}) => '$index av $total';
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) => '$replierName svarte på meldingen din';
+
+  @override
+  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+      '$replierName svarte på meldingen til $authorName';
+
   @override
   String get voiceRecordingPlayTooltip => 'Spill av';
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
index 818961e48e..035b44ec96 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
@@ -952,6 +952,13 @@ class _AccessibilityTranslationsPt extends AccessibilityTranslations {
   @override
   String attachmentPositionLabel({required int index, required int total}) => '$index de $total';
 
+  @override
+  String repliedToOwnMessageLabel({required String replierName}) => '$replierName respondeu à sua mensagem';
+
+  @override
+  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+      '$replierName respondeu à mensagem de $authorName';
+
   @override
   String get voiceRecordingPlayTooltip => 'Reproduzir';
 
diff --git a/packages/stream_chat_localizations/test/translations_test.dart b/packages/stream_chat_localizations/test/translations_test.dart
index 65a2d448fb..f12b9c01ab 100644
--- a/packages/stream_chat_localizations/test/translations_test.dart
+++ b/packages/stream_chat_localizations/test/translations_test.dart
@@ -494,6 +494,11 @@ void main() {
       expect(a11y.incomingMessagePreviewLabel(), isNotNull);
       expect(a11y.incomingMessagePreviewLabel(senderName: 'Alice'), isNotNull);
       expect(a11y.attachmentPositionLabel(index: 2, total: 5), isNotNull);
+      expect(a11y.repliedToOwnMessageLabel(replierName: 'Alice'), isNotNull);
+      expect(
+        a11y.repliedToMessageLabel(replierName: 'Alice', authorName: 'Bob'),
+        isNotNull,
+      );
       expect(a11y.outgoingMessageLabel(body: 'Hello'), isNotNull);
       expect(a11y.incomingMessageLabel(senderName: 'Alice', body: 'Hello'), isNotNull);
       expect(a11y.outgoingDeletedMessageLabel(body: 'Message deleted'), isNotNull);

From c0bc8b34b5afb80ac1331f832d72f0e7ea3b9295 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 16:29:05 +0200
Subject: [PATCH 07/22] docs(changelog): collapse the message a11y entries into
 one

Six bullets across two files described one piece of work. Replaced with a
single entry about the message-list screen-reader improvements, naming the two
new public parameters, and one grouped entry for the new localization strings.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 packages/stream_chat_flutter/CHANGELOG.md       | 7 +------
 packages/stream_chat_localizations/CHANGELOG.md | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 73678ab46c..19dffae7fa 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -3,7 +3,6 @@
 ✅ Added
 
 - Added `onReactionLongPress` to `StreamMessageItem` and `StreamMessageListView`, reporting the long-pressed message's `BuildContext` and a `ReactionLongPressDetails` with the `message` and `reaction` (the reaction is `null` for a clustered or overflow chip that maps to no single reaction).
-- Added `semanticsLabel` to `StreamMessageItem` and `StreamMessageItemProps`, replacing the screen-reader announcement composed for a message row.
 
 ⚠️ Changed
 
@@ -16,11 +15,7 @@
 
 🐞 Fixed
 
-- Fixed messages announcing only their content: a screen reader now reads each message row as one phrase naming the sender and the direction — "You said, …" for your own messages, "<name> said, …" for everyone else's — followed by the message body, the time it was sent, and the edited marker, while the attachments, reaction chips, quoted message, and replies row stay individually reachable one level deeper. The delivery status is announced as part of that phrase rather than costing a focus stop of its own. A deleted message announces who deleted it in the same way, without the "said" — "You, Message deleted" / "<name>, Message deleted". A custom `messageBuilder` or `StreamMessageItem` component builder replaces the default layout and is responsible for its own label.
-- Fixed a deleted message dropping its metadata: the placeholder was rendered on its own, without the timestamp and delivery status the design shows below it. Both are back, and a screen reader announces them as part of the message phrase. The edited marker is dropped for a deleted message, though — there is no text left to have been edited.
-- Fixed the quoted-message preview announcing only the quoted author's name, which said nothing about the reply relationship. It now announces who replied to whom — "Han Solo replied to your message" / "You replied to Leia's message" — followed by the quoted body. Pass `replyMessage` when building `StreamQuotedMessage` directly to get the same phrasing.
-- Fixed image, video, GIF and gallery attachments in the message list announcing nothing: the tiles were focusable — they open a preview on tap — but carried no label at all. Each now announces its type and, within a gallery, its position ("Photo, 2 of 5"), and the "+N" overflow badge no longer adds a stop of its own.
-- Fixed `StreamDateDivider` announcing a clock time it never displays — a divider reading "Yesterday" announced "Yesterday at 1:06 PM". It now announces the date exactly as shown, never uppercased (some screen readers spell all-caps words out letter by letter), and is exposed as a header so a screen reader can jump from day to day instead of swiping through every message in between.
+- Improved the screen-reader experience in the message list. Each message is announced as a single phrase naming the sender and the direction ("You said, …" / "<name> said, …") together with the body, the time, the edited marker and the delivery status, while the attachments, reaction chips, quoted message and replies row stay reachable one level deeper. Quoted messages say who replied to whom, attachment tiles announce their type and position in a gallery, date dividers announce the date they show — as a header — instead of a time they never showed, and a deleted message names who deleted it and keeps its timestamp and delivery status. `StreamMessageItem.semanticsLabel` and `StreamQuotedMessage.replyMessage` are new and let you adjust the composed announcements; a custom `messageBuilder` replaces the default layout and is responsible for its own label.
 - Fixed a crash on web when the message list rebuilt while messages were selectable, for example after opening the attachment picker.
 - Fixed the browser's native context menu reappearing over the message context menu on web after scrolling messages out of view or deleting one.
 - Fixed the SDK re-enabling the browser's native context menu on web in apps that had disabled it themselves.
diff --git a/packages/stream_chat_localizations/CHANGELOG.md b/packages/stream_chat_localizations/CHANGELOG.md
index f110926224..0f24f0e250 100644
--- a/packages/stream_chat_localizations/CHANGELOG.md
+++ b/packages/stream_chat_localizations/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ✅ Added
 
-- Added the message-list a11y strings `outgoingMessageLabel` ("You said, …") and `incomingMessageLabel` ("<name> said, …"), used to announce a message's sender and direction, along with `outgoingDeletedMessageLabel` ("You, …") and `incomingDeletedMessageLabel` ("<name>, …") for the deleted-message placeholder. Added `attachmentPositionLabel` ("2 of 5"), announced on gallery attachment tiles, and `repliedToOwnMessageLabel` / `repliedToMessageLabel` for the quoted-message preview. Every supported locale ships a native-language implementation.
+- Added the message-list a11y strings behind the new screen-reader announcements: `outgoingMessageLabel` / `incomingMessageLabel`, `outgoingDeletedMessageLabel` / `incomingDeletedMessageLabel`, `repliedToOwnMessageLabel` / `repliedToMessageLabel`, and `attachmentPositionLabel`. Every supported locale ships a native-language implementation.
 
 🔄 Changed
 

From 1bef9f4b34861e496cfacf31d6923e20eb6a5470 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 16:42:02 +0200
Subject: [PATCH 08/22] fix(ui): announce attachment upload progress instead of
 a bare "Sending"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While attachments upload, StreamMessageSendingStatus shows a progress count
("Uploaded 1 of 2 …") in place of a tick. Excluding that footer from the
semantics tree flattened it to the generic "Sending" in the row phrase, losing
progress a sighted reader can see. The phrase now mirrors the footer exactly,
same as it already does for the sent/delivered/read ticks.

Not added: upload state on the individual attachment tiles. Neither sibling SDK
puts it there — Android's tile description is a pure function of the media type
(MediaAttachmentContent.kt:470-490) and SwiftUI's formatter has no upload-state
input at all (its three metadata structs carry no state field), so a tile reads
identically whether it is sent, mid-upload, or failed. Keeping the state on the
message, where it is computed once, also avoids re-deriving it per tile.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../message_widget/stream_message_item.dart   | 22 +++++++++++--
 .../stream_message_item_semantics_test.dart   | 33 +++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 134e562e8d..621cc08405 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -1334,14 +1334,30 @@ class _MessageRowSemantics extends StatelessWidget {
     );
   }
 
-  // Mirrors the icon [StreamSendingIndicator] picks for the same state, so the
-  // announcement and the visible check marks never disagree.
+  // Mirrors what [StreamMessageSendingStatus] renders for the same state, so
+  // the announcement and the visible footer never disagree.
   String? _statusLabel(
     BuildContext context, {
     required bool isMessageRead,
     required bool isMessageDelivered,
   }) {
-    final a11y = context.translations.accessibility;
+    final translations = context.translations;
+
+    // While attachments upload the footer shows how many are done instead of a
+    // tick. Mirror that rather than flattening it to "Sending", so the
+    // announcement carries the same progress the reader can see.
+    final attachments = message.attachments;
+    if (message.state.isOutgoing && attachments.any((it) => it.type != AttachmentType.urlPreview)) {
+      final uploaded = attachments.where((it) => it.uploadState.isSuccess).length;
+      if (uploaded < attachments.length) {
+        return translations.attachmentsUploadProgressText(
+          completed: uploaded,
+          total: attachments.length,
+        );
+      }
+    }
+
+    final a11y = translations.accessibility;
 
     if (isMessageRead) return a11y.messageReadStatusLabel;
     if (isMessageDelivered) return a11y.messageDeliveredStatusLabel;
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index f8bfcf4b12..23f4f5fb2a 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -44,6 +44,9 @@ class _FakeLocalizations implements StreamChatLocalizations {
   @override
   String photosAttachmentCountText(int count) => DefaultTranslations.instance.photosAttachmentCountText(count);
 
+  @override
+  String attachmentsUploadProgressText({required int completed, required int total}) => 'UP:$completed/$total';
+
   // Anything else throws instead of resolving to null, so an unstubbed lookup
   // fails the test loudly rather than rendering an empty label.
   @override
@@ -397,6 +400,36 @@ void main() {
       handle.dispose();
     });
 
+    testWidgets('announces upload progress while attachments are sending', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(
+            user: currentUser,
+            state: MessageState.sending,
+            attachments: [
+              Attachment(type: AttachmentType.image, imageUrl: 'https://x/1.png'),
+              Attachment(
+                type: AttachmentType.image,
+                imageUrl: 'https://x/2.png',
+                uploadState: const UploadState.success(),
+              ),
+            ],
+          ),
+          alignment: StreamMessageAlignment.end,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      // The footer shows the progress count rather than a tick, so the phrase
+      // carries it too instead of flattening to "Sending".
+      expect(labelsOf(tester).first, endsWith(', UP:1/2'));
+      expect(labelsOf(tester).first, isNot(contains('Sending')));
+
+      handle.dispose();
+    });
+
     testWidgets('folds the sending status into the row label', (tester) async {
       final handle = tester.ensureSemantics();
 

From 6fdedb2c6a3f87ac0a8b9d5aa96d1dd80d1644df Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 16:49:27 +0200
Subject: [PATCH 09/22] fix(ui, localization): announce a message that failed
 to send
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A failed message announced nothing about the failure. StreamSendingIndicator
has no failed branch, so the footer shows no tick, and the failure is conveyed
by an error badge on the bubble — a bare exclamation icon with no text of its
own. A screen-reader user heard a message identical to any other and had no way
to learn it never went out.

The row phrase now ends with "Message failed to send" in place of a delivery
status, on the same condition that shows the badge (a failed send or a
moderation bounce).

The wording is the phrase both sibling SDKs use, though neither reaches it from
the message list: Android's `..._semantics_message_status_failed` is gated out
of the footer by `shouldShowMessageStatusIndicator()`, and SwiftUI has no failed
status at all — `MessageViewModel.swift:255-266` collapses `.pending` and
`.failed` into "sent", announcing a failed message as sent.

Adds `messageFailedStatusLabel`, with native implementations for all 11 locales.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 packages/stream_chat_flutter/CHANGELOG.md     |  2 +-
 .../accessibility_translations.dart           | 11 +++++++++++
 .../message_widget/stream_message_item.dart   | 12 ++++++++++--
 .../stream_message_item_semantics_test.dart   | 19 +++++++++++++++++++
 .../stream_chat_localizations/CHANGELOG.md    |  2 +-
 .../lib/src/stream_chat_localizations_ca.dart |  3 +++
 .../lib/src/stream_chat_localizations_de.dart |  3 +++
 .../lib/src/stream_chat_localizations_en.dart |  3 +++
 .../lib/src/stream_chat_localizations_es.dart |  3 +++
 .../lib/src/stream_chat_localizations_fr.dart |  3 +++
 .../lib/src/stream_chat_localizations_hi.dart |  3 +++
 .../lib/src/stream_chat_localizations_it.dart |  3 +++
 .../lib/src/stream_chat_localizations_ja.dart |  3 +++
 .../lib/src/stream_chat_localizations_ko.dart |  3 +++
 .../lib/src/stream_chat_localizations_no.dart |  3 +++
 .../lib/src/stream_chat_localizations_pt.dart |  3 +++
 .../test/translations_test.dart               |  1 +
 17 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 19dffae7fa..6017fc1908 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -15,7 +15,7 @@
 
 🐞 Fixed
 
-- Improved the screen-reader experience in the message list. Each message is announced as a single phrase naming the sender and the direction ("You said, …" / "<name> said, …") together with the body, the time, the edited marker and the delivery status, while the attachments, reaction chips, quoted message and replies row stay reachable one level deeper. Quoted messages say who replied to whom, attachment tiles announce their type and position in a gallery, date dividers announce the date they show — as a header — instead of a time they never showed, and a deleted message names who deleted it and keeps its timestamp and delivery status. `StreamMessageItem.semanticsLabel` and `StreamQuotedMessage.replyMessage` are new and let you adjust the composed announcements; a custom `messageBuilder` replaces the default layout and is responsible for its own label.
+- Improved the screen-reader experience in the message list. Each message is announced as a single phrase naming the sender and the direction ("You said, …" / "<name> said, …") together with the body, the time, the edited marker and the delivery status — including upload progress and a failure to send — while the attachments, reaction chips, quoted message and replies row stay reachable one level deeper. Quoted messages say who replied to whom, attachment tiles announce their type and position in a gallery, date dividers announce the date they show — as a header — instead of a time they never showed, and a deleted message names who deleted it and keeps its timestamp and delivery status. `StreamMessageItem.semanticsLabel` and `StreamQuotedMessage.replyMessage` are new and let you adjust the composed announcements; a custom `messageBuilder` replaces the default layout and is responsible for its own label.
 - Fixed a crash on web when the message list rebuilt while messages were selectable, for example after opening the attachment picker.
 - Fixed the browser's native context menu reappearing over the message context menu on web after scrolling messages out of view or deleting one.
 - Fixed the SDK re-enabling the browser's native context menu on web in apps that had disabled it themselves.
diff --git a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
index ea47e76e0c..0a655f49dd 100644
--- a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
+++ b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
@@ -261,6 +261,14 @@ abstract class AccessibilityTranslations {
   /// message has been read by the recipient, e.g. `"Read"`.
   String get messageReadStatusLabel;
 
+  /// The screen-reader label for a message that could not be sent, e.g.
+  /// `"Message failed to send"`.
+  ///
+  /// Announced in place of a delivery status. The failure is shown as a badge
+  /// on the bubble, which carries no text of its own, so this is the only way
+  /// a screen reader learns the message did not go out.
+  String get messageFailedStatusLabel;
+
   /// The screen-reader phrasing for a batch of unread messages, e.g.
   /// `"9 unread messages"` / `"1 unread message"`.
   ///
@@ -583,6 +591,9 @@ class DefaultAccessibilityTranslations extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => 'Read';
 
+  @override
+  String get messageFailedStatusLabel => 'Message failed to send';
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 621cc08405..03ea74ee04 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -1334,8 +1334,9 @@ class _MessageRowSemantics extends StatelessWidget {
     );
   }
 
-  // Mirrors what [StreamMessageSendingStatus] renders for the same state, so
-  // the announcement and the visible footer never disagree.
+  // Mirrors what the message shows for the same state — the footer's
+  // [StreamMessageSendingStatus], or the error badge on the bubble — so the
+  // announcement and the visible state never disagree.
   String? _statusLabel(
     BuildContext context, {
     required bool isMessageRead,
@@ -1359,6 +1360,13 @@ class _MessageRowSemantics extends StatelessWidget {
 
     final a11y = translations.accessibility;
 
+    // A failed send is shown as a badge on the bubble rather than a footer
+    // tick, and the badge is a bare icon with no text of its own, so without
+    // this the row announces nothing about the failure.
+    if (message.state.isFailed || message.isBouncedWithError) {
+      return a11y.messageFailedStatusLabel;
+    }
+
     if (isMessageRead) return a11y.messageReadStatusLabel;
     if (isMessageDelivered) return a11y.messageDeliveredStatusLabel;
     if (message.state.isCompleted) return a11y.messageSentStatusLabel;
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index 23f4f5fb2a..b22bee99d9 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -430,6 +430,25 @@ void main() {
       handle.dispose();
     });
 
+    testWidgets('announces a message that failed to send', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(user: currentUser, state: MessageState.sendingFailed(skipPush: false, skipEnrichUrl: false)),
+          alignment: StreamMessageAlignment.end,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      // The failure is shown as a badge on the bubble, which is a bare icon
+      // with no text, so the row phrase is the only place it can be heard.
+      final failed = DefaultTranslations.instance.accessibility.messageFailedStatusLabel;
+      expect(labelsOf(tester).first, endsWith(', $failed'));
+
+      handle.dispose();
+    });
+
     testWidgets('folds the sending status into the row label', (tester) async {
       final handle = tester.ensureSemantics();
 
diff --git a/packages/stream_chat_localizations/CHANGELOG.md b/packages/stream_chat_localizations/CHANGELOG.md
index 0f24f0e250..8621dcd916 100644
--- a/packages/stream_chat_localizations/CHANGELOG.md
+++ b/packages/stream_chat_localizations/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ✅ Added
 
-- Added the message-list a11y strings behind the new screen-reader announcements: `outgoingMessageLabel` / `incomingMessageLabel`, `outgoingDeletedMessageLabel` / `incomingDeletedMessageLabel`, `repliedToOwnMessageLabel` / `repliedToMessageLabel`, and `attachmentPositionLabel`. Every supported locale ships a native-language implementation.
+- Added the message-list a11y strings behind the new screen-reader announcements: `outgoingMessageLabel` / `incomingMessageLabel`, `outgoingDeletedMessageLabel` / `incomingDeletedMessageLabel`, `repliedToOwnMessageLabel` / `repliedToMessageLabel`, `attachmentPositionLabel`, and `messageFailedStatusLabel`. Every supported locale ships a native-language implementation.
 
 🔄 Changed
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
index cf1eb9b702..66a3d484e2 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
@@ -1036,6 +1036,9 @@ class _AccessibilityTranslationsCa extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => 'Llegit';
 
+  @override
+  String get messageFailedStatusLabel => "No s'ha pogut enviar el missatge";
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
index 93cb1063da..72fceb04e7 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
@@ -1034,6 +1034,9 @@ class _AccessibilityTranslationsDe extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => 'Gelesen';
 
+  @override
+  String get messageFailedStatusLabel => 'Nachricht konnte nicht gesendet werden';
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
index 29b749f82a..a0bfdb6df5 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
@@ -1034,6 +1034,9 @@ class _AccessibilityTranslationsEn extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => 'Read';
 
+  @override
+  String get messageFailedStatusLabel => 'Message failed to send';
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
index 78d52456b9..3ef83c9f16 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
@@ -1038,6 +1038,9 @@ class _AccessibilityTranslationsEs extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => 'Leído';
 
+  @override
+  String get messageFailedStatusLabel => 'No se pudo enviar el mensaje';
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
index 41e01c0e18..25dfb41108 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
@@ -1040,6 +1040,9 @@ class _AccessibilityTranslationsFr extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => 'Lu';
 
+  @override
+  String get messageFailedStatusLabel => "Échec de l'envoi du message";
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
index 7ba242c653..002e619c74 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
@@ -1035,6 +1035,9 @@ class _AccessibilityTranslationsHi extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => 'पढ़ा गया';
 
+  @override
+  String get messageFailedStatusLabel => 'संदेश भेजना विफल रहा';
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
index 3d6f487110..30369d5bd4 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
@@ -1048,6 +1048,9 @@ class _AccessibilityTranslationsIt extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => 'Letto';
 
+  @override
+  String get messageFailedStatusLabel => 'Invio del messaggio non riuscito';
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
index a819b85838..a593a517ab 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
@@ -1013,6 +1013,9 @@ class _AccessibilityTranslationsJa extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => '既読';
 
+  @override
+  String get messageFailedStatusLabel => 'メッセージを送信できませんでした';
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
index 52587502ca..65a1ed6410 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
@@ -1016,6 +1016,9 @@ class _AccessibilityTranslationsKo extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => '읽음';
 
+  @override
+  String get messageFailedStatusLabel => '메시지를 보내지 못했습니다';
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
index aa0dee4b13..b8b8593da3 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
@@ -1019,6 +1019,9 @@ class _AccessibilityTranslationsNo extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => 'Lest';
 
+  @override
+  String get messageFailedStatusLabel => 'Meldingen ble ikke sendt';
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
index 035b44ec96..b77ae4ffc4 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
@@ -1037,6 +1037,9 @@ class _AccessibilityTranslationsPt extends AccessibilityTranslations {
   @override
   String get messageReadStatusLabel => 'Lido';
 
+  @override
+  String get messageFailedStatusLabel => 'Falha ao enviar a mensagem';
+
   @override
   String unreadMessagesLabel({required int count}) {
     return Intl.plural(
diff --git a/packages/stream_chat_localizations/test/translations_test.dart b/packages/stream_chat_localizations/test/translations_test.dart
index f12b9c01ab..a2fbd3c696 100644
--- a/packages/stream_chat_localizations/test/translations_test.dart
+++ b/packages/stream_chat_localizations/test/translations_test.dart
@@ -493,6 +493,7 @@ void main() {
       expect(a11y.outgoingMessagePreviewLabel, isNotNull);
       expect(a11y.incomingMessagePreviewLabel(), isNotNull);
       expect(a11y.incomingMessagePreviewLabel(senderName: 'Alice'), isNotNull);
+      expect(a11y.messageFailedStatusLabel, isNotNull);
       expect(a11y.attachmentPositionLabel(index: 2, total: 5), isNotNull);
       expect(a11y.repliedToOwnMessageLabel(replierName: 'Alice'), isNotNull);
       expect(

From c597c74783a8b9cd5d8e9b8da30767317b31f7fd Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 16:57:52 +0200
Subject: [PATCH 10/22] fix(ui): announce the message text the bubble actually
 shows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The message-translations feature merged from master lets the reader toggle a
translated message back to its original text, and can be disabled entirely by
configuration. The composed row phrase ignored both and always announced the
translation, so a reader who toggled to the original heard text that was no
longer on screen.

The phrase now resolves the text the same way `StreamMessageText` does — the
translation only when one is actually shown — so it follows the toggle.

The translation annotation itself needs nothing: it is an interactive
`StreamMessageAnnotation`, so it is already a focus stop of its own announcing
"Translated from German" and "Show original".

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../message_widget/stream_message_item.dart   | 17 ++++++++---
 .../stream_message_item_semantics_test.dart   | 30 +++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 2b33f52514..562c07ce54 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -741,11 +741,20 @@ class DefaultStreamMessageItem extends StatelessWidget {
   String _bodySemanticsLabel(BuildContext context, Message message, User? currentUser) {
     final formatter = StreamChatConfiguration.of(context).messagePreviewFormatter;
 
-    // Mirror what the bubble renders — the translated text with mentions
-    // resolved to display names — so the announcement matches the visible text
-    // instead of raw `@id` tokens.
+    // Mirror what the bubble renders — mentions resolved to display names, and
+    // the translation only when one is actually shown — so the announcement
+    // matches the visible text instead of raw `@id` tokens or a translation the
+    // reader has toggled away. Mirrors [StreamMessageText].
+    final translationEnabled = StreamChatConfiguration.of(context).messageTranslation.enabled;
+    final showsOriginalText = StreamMessageTranslations.isShowingOriginalTextOf(context, message.id);
+
     final language = currentUser?.language ?? 'en';
-    final announced = message.translate(language).replaceMentions(linkify: false);
+    final shown = switch (translationEnabled && !showsOriginalText) {
+      true => message.translate(language),
+      false => message,
+    };
+
+    final announced = shown.replaceMentions(linkify: false);
 
     return switch (formatter) {
       final AccessibleMessagePreviewFormatter it => it.formatMessageSemanticsLabel(
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index b22bee99d9..b5ceb32c65 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -256,6 +256,36 @@ void main() {
       handle.dispose();
     });
 
+    testWidgets('announces the translation the bubble shows, and the original when toggled', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      final translated = Message(
+        id: 'translated-message',
+        text: 'hallo',
+        createdAt: DateTime(2026, 8, 26, 15),
+        user: otherUser,
+        state: MessageState.sent,
+        i18n: const {'en_text': 'hello', 'language': 'de'},
+      );
+
+      await tester.pumpWidget(buildScene(translated));
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester), contains('IN:Han Solo:hello, AT-TIME'));
+
+      // Toggling back to the original has to move the announcement with it,
+      // or the phrase describes text that is no longer on screen.
+      StreamMessageTranslations.toggleOriginalText(
+        tester.element(find.byType(DefaultStreamMessageItem)),
+        translated.id,
+      );
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester), contains('IN:Han Solo:hallo, AT-TIME'));
+
+      handle.dispose();
+    });
+
     testWidgets('announces mentions by display name, not by id', (tester) async {
       final handle = tester.ensureSemantics();
 

From 5009b735c9f1ac1cff633deb4ef1e8abf919f423 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 17:01:14 +0200
Subject: [PATCH 11/22] docs(ui): explain the unnamed-sender fallback in the
 message a11y label

Reading it, it is not obvious that the bare body is right for a deleted
message. It is: the formatter already returns "Message deleted" as the body, so
the announcement stays complete and only loses the attribution there is no name
for. Noted too that `User.name` falls back to the user id, which makes the
branch close to unreachable.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../lib/src/message_widget/stream_message_item.dart      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 562c07ce54..583df19ec6 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -723,8 +723,13 @@ class DefaultStreamMessageItem extends StatelessWidget {
     }
 
     // Announce the full sender name — screen readers are not width-bound like
-    // the visual footer, and a surname disambiguates when several members
-    // share a first name. Without a name there is nothing to announce.
+    // the visual footer, and a surname disambiguates when several members share
+    // a first name.
+    //
+    // With no name there is nothing to attribute, so the body stands alone —
+    // the message text, or "Message deleted" for a deleted message, which is
+    // already what the formatter returns for one. [User.name] falls back to
+    // the user id, so this is close to unreachable.
     final senderName = sender.name.trim();
     if (senderName.isEmpty) return body;
 

From 33d803587359f29f499324ada5ed3f271761be29 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Wed, 26 Aug 2026 17:05:59 +0200
Subject: [PATCH 12/22] fix(ui): don't default the reader's language when
 announcing message text
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The composed row phrase fell back to `'en'` when the reader had no language
set, so it announced the English translation of a message whose bubble showed
the original — `StreamMessageText` passes the unset language straight through,
and `translate` returns the message unchanged for it. Passing the language
through unchanged keeps the two in step, and leaves no default language behind
in the package.

The existing translation test was passing only because of that fallback: its
reader had no language, so it asserted a translation the bubble would not have
shown. The reader now has one, and a second case covers a reader without.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../message_widget/stream_message_item.dart   |  5 ++--
 .../stream_message_item_semantics_test.dart   | 28 +++++++++++++++++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 583df19ec6..d3a8738ed9 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -753,9 +753,10 @@ class DefaultStreamMessageItem extends StatelessWidget {
     final translationEnabled = StreamChatConfiguration.of(context).messageTranslation.enabled;
     final showsOriginalText = StreamMessageTranslations.isShowingOriginalTextOf(context, message.id);
 
-    final language = currentUser?.language ?? 'en';
+    // No default language: `translate` returns the message unchanged when the
+    // reader has none set, which is what should be announced.
     final shown = switch (translationEnabled && !showsOriginalText) {
-      true => message.translate(language),
+      true => message.translate(currentUser?.language),
       false => message,
     };
 
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index b5ceb32c65..b54643972a 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -89,12 +89,15 @@ class _FixedSizeAttachmentBuilder extends StreamAttachmentWidgetBuilder {
 
 void main() {
   group('StreamMessageItem sender and direction announcement', () {
-    final currentUser = OwnUser(id: 'current-user', name: 'Luke Skywalker');
+    // A language is what makes a translated message resolve to the reader's
+    // own language, in the bubble and in the announcement alike.
+    final currentUser = OwnUser(id: 'current-user', name: 'Luke Skywalker', language: 'en');
     final otherUser = User(id: 'other-user', name: 'Han Solo');
 
     Widget buildScene(
       Message message, {
       String? semanticsLabel,
+      OwnUser? reader,
       StreamMessageAlignment alignment = StreamMessageAlignment.start,
       // Set to false to resolve the shipped English strings instead of the
       // sentinels, pinning what a user actually hears.
@@ -106,8 +109,9 @@ void main() {
       final channelState = MockChannelState();
 
       when(() => client.state).thenReturn(clientState);
-      when(() => clientState.currentUser).thenReturn(currentUser);
-      when(() => clientState.currentUserStream).thenAnswer((_) => Stream.value(currentUser));
+      final effectiveReader = reader ?? currentUser;
+      when(() => clientState.currentUser).thenReturn(effectiveReader);
+      when(() => clientState.currentUserStream).thenAnswer((_) => Stream.value(effectiveReader));
       when(() => channel.client).thenReturn(client);
       when(() => channel.state).thenReturn(channelState);
       when(() => channelState.readStream).thenAnswer((_) => Stream.value(const []));
@@ -286,6 +290,24 @@ void main() {
       handle.dispose();
     });
 
+    testWidgets('announces the original text to a reader with no language set', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      // The bubble does not translate for a reader with no language, so the
+      // announcement must not either.
+      await tester.pumpWidget(
+        buildScene(
+          message(text: 'hallo').copyWith(i18n: const {'en_text': 'hello', 'language': 'de'}),
+          reader: OwnUser(id: 'current-user', name: 'Luke Skywalker'),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester), contains('IN:Han Solo:hallo, AT-TIME'));
+
+      handle.dispose();
+    });
+
     testWidgets('announces mentions by display name, not by id', (tester) async {
       final handle = tester.ensureSemantics();
 

From 06d1155bcdfa032a8369c9e43e7ec1f25b221449 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Thu, 27 Aug 2026 09:46:59 +0200
Subject: [PATCH 13/22] fix(ui, localization): address review findings on the
 message a11y work

- An empty `semanticsLabel` is documented as leaving a row unlabeled, but an
  own message still had its delivery status appended to it, announcing a bare
  ", Sent". Empty now counts as having no label, like null.
- The date-divider semantics tests classified dates against a live clock, so a
  run crossing midnight could reclassify "Today". Pinned with `withClock` and a
  fixed date; verified the frozen clock drives the assertion by shifting the
  date and watching the label change.
- Norwegian `repliedToMessageLabel` said "meldingen til <name>", which can read
  as the message *to* that person. Changed to "meldingen fra <name>". Still
  wants a native-speaker pass, like the rest of the batch.
- Dropped an always-matching pattern branch around the footer timestamp;
  `Message.createdAt` is a non-nullable getter.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../components/stream_message_footer.dart     | 15 +++++-------
 .../message_widget/stream_message_item.dart   |  7 ++++--
 .../stream_message_item_semantics_test.dart   | 20 ++++++++++++++++
 .../test/src/misc/date_divider_test.dart      | 23 ++++++++++++++-----
 .../lib/src/stream_chat_localizations_no.dart |  2 +-
 5 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
index f3308fe0f4..c421addd05 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
@@ -101,15 +101,12 @@ class DefaultStreamMessageFooter extends StatelessWidget {
       );
     }
 
-    final Widget timestampWidget;
-    if (message.createdAt case final createdAt) {
-      timestampWidget = ExcludeSemantics(
-        child: StreamTimestamp(
-          date: createdAt.toLocal(),
-          formatter: (context, date) => Jiffy.parseFromDateTime(date).jm,
-        ),
-      );
-    }
+    final timestampWidget = ExcludeSemantics(
+      child: StreamTimestamp(
+        date: message.createdAt.toLocal(),
+        formatter: (context, date) => Jiffy.parseFromDateTime(date).jm,
+      ),
+    );
 
     Widget? editedWidget;
     // A deleted message has no text left to have been edited, so the marker
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index d3a8738ed9..91269a2cec 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -1328,12 +1328,15 @@ class _MessageRowSemantics extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final label = this.label;
     final currentUser = StreamChat.maybeOf(context)?.currentUser;
     final isOwnMessage = message.user?.id == currentUser?.id;
 
     // Only the sender sees a delivery status, and a row with no label of its
-    // own has nothing to append it to.
-    if (!isOwnMessage || label == null) {
+    // own has nothing to append it to. An empty label is the documented way to
+    // leave a row unlabeled, so it counts as having none — otherwise the row
+    // would announce a bare ", Sent".
+    if (!isOwnMessage || label == null || label.isEmpty) {
       return Semantics(label: label, explicitChildNodes: true, child: child);
     }
 
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index b54643972a..d29e3fead4 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -438,6 +438,26 @@ void main() {
       handle.dispose();
     });
 
+    testWidgets('an empty semanticsLabel leaves the row unlabeled', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(user: currentUser),
+          semanticsLabel: '',
+          alignment: StreamMessageAlignment.end,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      // An own message would otherwise have its delivery status appended to
+      // nothing, announcing a bare ", Sent".
+      expect(labelsOf(tester), isNot(contains(startsWith(','))));
+      expect(labelsOf(tester).where((it) => it.contains('Sent')), isEmpty);
+
+      handle.dispose();
+    });
+
     // Non-regression guards: these pass with and without the row label, and
     // exist to prove the label did not swallow the stops a screen-reader user
     // still needs to reach.
diff --git a/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart b/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart
index 3ab1b885fb..34497f9d9b 100644
--- a/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart
+++ b/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart
@@ -1,3 +1,4 @@
+import 'package:clock/clock.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
@@ -120,6 +121,10 @@ void main() {
   );
 
   group('semantics', () {
+    // Pinned, and away from midnight: `isToday` compares the date against
+    // `clock.now()`, so a live clock could reclassify "Today" mid-test.
+    final now = DateTime(2026, 8, 26, 15);
+
     Widget buildDivider({required DateTime date, bool uppercase = false}) {
       final client = MockClient();
       final clientState = MockClientState();
@@ -140,8 +145,10 @@ void main() {
     testWidgets('announces the date it shows, without a time', (tester) async {
       final handle = tester.ensureSemantics();
 
-      await tester.pumpWidget(buildDivider(date: DateTime.now()));
-      await tester.pumpAndSettle();
+      await withClock(Clock.fixed(now), () async {
+        await tester.pumpWidget(buildDivider(date: now));
+        await tester.pumpAndSettle();
+      });
 
       final node = tester.semantics.find(find.byType(StreamDateDivider));
       expect(node.label, 'Today');
@@ -156,8 +163,10 @@ void main() {
     testWidgets('is exposed as a header so days can be jumped between', (tester) async {
       final handle = tester.ensureSemantics();
 
-      await tester.pumpWidget(buildDivider(date: DateTime.now()));
-      await tester.pumpAndSettle();
+      await withClock(Clock.fixed(now), () async {
+        await tester.pumpWidget(buildDivider(date: now));
+        await tester.pumpAndSettle();
+      });
 
       expect(
         tester.semantics.find(find.byType(StreamDateDivider)),
@@ -170,8 +179,10 @@ void main() {
     testWidgets('announces the date unshouted when displayed uppercase', (tester) async {
       final handle = tester.ensureSemantics();
 
-      await tester.pumpWidget(buildDivider(date: DateTime.now(), uppercase: true));
-      await tester.pumpAndSettle();
+      await withClock(Clock.fixed(now), () async {
+        await tester.pumpWidget(buildDivider(date: now, uppercase: true));
+        await tester.pumpAndSettle();
+      });
 
       expect(find.text('TODAY'), findsOneWidget);
       // Some screen readers spell out all-caps words letter by letter.
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
index 6c8a9cc2a1..73061df2c3 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
@@ -954,7 +954,7 @@ class _AccessibilityTranslationsNo extends AccessibilityTranslations {
 
   @override
   String repliedToMessageLabel({required String replierName, required String authorName}) =>
-      '$replierName svarte på meldingen til $authorName';
+      '$replierName svarte på meldingen fra $authorName';
 
   @override
   String get voiceRecordingPlayTooltip => 'Spill av';

From dab683a6ad566c553758497071e84718103b4d55 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Thu, 27 Aug 2026 10:12:53 +0200
Subject: [PATCH 14/22] fix(ui): don't take an authorless message for the
 reader's own

`_MessageRowSemantics` compared two nullables, so a message with no author read
by nobody signed in matched on `null == null` and had a delivery status
appended: "no one sent this, Today at 3:00 PM, Sent". Both sides are now
required to be present before their ids are compared.

Every other site that makes this comparison already guards the sender first
(`stream_message_footer.dart:95`, `stream_message_item.dart:718`) or compares
against a non-null id, so this was the only one affected.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../message_widget/stream_message_item.dart   |  8 ++++-
 .../stream_message_item_semantics_test.dart   | 29 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 91269a2cec..b3de77ae04 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -1330,7 +1330,13 @@ class _MessageRowSemantics extends StatelessWidget {
   Widget build(BuildContext context) {
     final label = this.label;
     final currentUser = StreamChat.maybeOf(context)?.currentUser;
-    final isOwnMessage = message.user?.id == currentUser?.id;
+
+    // Compared as nullables, an authorless message read by nobody signed in
+    // would match on `null == null` and claim a delivery status it never had.
+    final isOwnMessage = switch ((message.user, currentUser)) {
+      (final sender?, final reader?) => sender.id == reader.id,
+      _ => false,
+    };
 
     // Only the sender sees a delivery status, and a row with no label of its
     // own has nothing to append it to. An empty label is the documented way to
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index d29e3fead4..f945ba5ac8 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -98,6 +98,7 @@ void main() {
       Message message, {
       String? semanticsLabel,
       OwnUser? reader,
+      bool signedIn = true,
       StreamMessageAlignment alignment = StreamMessageAlignment.start,
       // Set to false to resolve the shipped English strings instead of the
       // sentinels, pinning what a user actually hears.
@@ -109,7 +110,10 @@ void main() {
       final channelState = MockChannelState();
 
       when(() => client.state).thenReturn(clientState);
-      final effectiveReader = reader ?? currentUser;
+      final effectiveReader = switch (signedIn) {
+        true => reader ?? currentUser,
+        false => null,
+      };
       when(() => clientState.currentUser).thenReturn(effectiveReader);
       when(() => clientState.currentUserStream).thenAnswer((_) => Stream.value(effectiveReader));
       when(() => channel.client).thenReturn(client);
@@ -458,6 +462,29 @@ void main() {
       handle.dispose();
     });
 
+    testWidgets("does not take an authorless message for the reader's own", (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          Message(
+            id: 'authorless-message',
+            text: 'no one sent this',
+            createdAt: DateTime(2026, 8, 26, 15),
+            state: MessageState.sent,
+          ),
+          signedIn: false,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      // A null author and a null reader used to compare equal, so the row
+      // claimed a delivery status for a message nobody sent.
+      expect(labelsOf(tester).first, 'no one sent this, AT-TIME');
+
+      handle.dispose();
+    });
+
     // Non-regression guards: these pass with and without the row label, and
     // exist to prove the label did not swallow the stops a screen-reader user
     // still needs to reach.

From 38a4361cc3dd933db6c9c73d8096ef9bc32d1a61 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Thu, 27 Aug 2026 15:02:36 +0200
Subject: [PATCH 15/22] refactor(ui): give the message delivery status one
 source of truth
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The branch order deciding whether a message reads as sending, sent,
delivered or read was written out three times: once in
StreamSendingIndicator to pick an icon, once in StreamMessageSendingStatus
to decide between upload progress and that icon, and once again in the row
announcement added by this branch. The three had already drifted — only the
announcement knew about a failed or bounced send.

Move both decisions onto Translations as attachmentUploadProgressLabel and
messageDeliveryStatusLabel, and have all three read from there. The icon now
takes its semantic label from the same call that the row announcement uses,
so what a reader sees and what a screen reader hears cannot describe
different states.

No behaviour change.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../lib/src/indicators/sending_indicator.dart | 75 +++++++++++++++++--
 .../stream_message_sending_status.dart        | 22 +-----
 .../message_widget/stream_message_item.dart   | 32 ++------
 3 files changed, 79 insertions(+), 50 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart b/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart
index 412aa2da68..fbe1176c08 100644
--- a/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart
+++ b/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 
 import '../../stream_chat_flutter.dart';
+import '../localization/translations.dart';
 import '../misc/empty_widget.dart';
 
 /// {@template streamSendingIndicator}
@@ -38,14 +39,22 @@ class StreamSendingIndicator extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colorScheme = context.streamColorScheme;
-    final a11y = context.translations.accessibility;
+
+    // Resolved once and reused by every branch below, so the icon a reader
+    // sees and the label a screen reader hears can never describe different
+    // states.
+    final semanticLabel = context.translations.messageDeliveryStatusLabel(
+      message,
+      isMessageRead: isMessageRead,
+      isMessageDelivered: isMessageDelivered,
+    );
 
     if (isMessageRead) {
       return Icon(
         context.streamIcons.checks,
         size: size,
         color: color ?? colorScheme.accentPrimary,
-        semanticLabel: a11y.messageReadStatusLabel,
+        semanticLabel: semanticLabel,
       );
     }
 
@@ -54,7 +63,7 @@ class StreamSendingIndicator extends StatelessWidget {
         context.streamIcons.checks,
         size: size,
         color: color ?? colorScheme.textSecondary,
-        semanticLabel: a11y.messageDeliveredStatusLabel,
+        semanticLabel: semanticLabel,
       );
     }
 
@@ -63,7 +72,7 @@ class StreamSendingIndicator extends StatelessWidget {
         context.streamIcons.checkmark,
         size: size,
         color: color ?? colorScheme.textSecondary,
-        semanticLabel: a11y.messageSentStatusLabel,
+        semanticLabel: semanticLabel,
       );
     }
 
@@ -72,10 +81,66 @@ class StreamSendingIndicator extends StatelessWidget {
         context.streamIcons.clock,
         size: size,
         color: color ?? colorScheme.textSecondary,
-        semanticLabel: a11y.messageSendingStatusLabel,
+        semanticLabel: semanticLabel,
       );
     }
 
     return const Empty();
   }
 }
+
+/// The status labels a message announces, shared by the widgets that render
+/// that status and by the composed message row announcement.
+///
+/// [StreamSendingIndicator] and [StreamMessageSendingStatus] render the status
+/// visually, while [StreamMessageItem] speaks it as part of the row label.
+/// Both read the state through these two members, so a change to what counts
+/// as sent, delivered or read lands in one place instead of drifting between
+/// the icon and the announcement.
+extension StreamMessageStatusLabels on Translations {
+  /// How many of [message]'s attachments have finished uploading, or null once
+  /// they all have.
+  ///
+  /// While attachments upload, the footer shows this progress in place of a
+  /// delivery tick, so the announcement carries the same progress rather than
+  /// flattening it to "Sending".
+  String? attachmentUploadProgressLabel(Message message) {
+    if (!message.state.isOutgoing) return null;
+
+    // A url preview is generated rather than uploaded, so counting it would
+    // report progress against an attachment the sender never picked.
+    final attachments = message.attachments;
+    if (!attachments.any((it) => it.type != AttachmentType.urlPreview)) return null;
+
+    final uploaded = attachments.where((it) => it.uploadState.isSuccess).length;
+    if (uploaded >= attachments.length) return null;
+
+    return attachmentsUploadProgressText(
+      completed: uploaded,
+      total: attachments.length,
+    );
+  }
+
+  /// The delivery status announced for [message], or null when it has none.
+  ///
+  /// A failed send is shown as a badge on the bubble rather than a footer tick,
+  /// and the badge is a bare icon with no text of its own, so the failure is
+  /// reported here instead.
+  String? messageDeliveryStatusLabel(
+    Message message, {
+    required bool isMessageRead,
+    required bool isMessageDelivered,
+  }) {
+    final a11y = accessibility;
+
+    if (message.state.isFailed || message.isBouncedWithError) {
+      return a11y.messageFailedStatusLabel;
+    }
+
+    if (isMessageRead) return a11y.messageReadStatusLabel;
+    if (isMessageDelivered) return a11y.messageDeliveredStatusLabel;
+    if (message.state.isCompleted) return a11y.messageSentStatusLabel;
+    if (message.state.isOutgoing) return a11y.messageSendingStatusLabel;
+    return null;
+  }
+}
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_sending_status.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_sending_status.dart
index 16685a2d03..64289cfa57 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_sending_status.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_sending_status.dart
@@ -29,24 +29,10 @@ class StreamMessageSendingStatus extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final attachments = message.attachments;
-
-    final hasNonUrlAttachments = attachments.any((it) => it.type != AttachmentType.urlPreview);
-
-    if (hasNonUrlAttachments && message.state.isOutgoing) {
-      final attachments = message.attachments;
-
-      final totalAttachments = attachments.length;
-      final uploadedCount = attachments.where((it) => it.uploadState.isSuccess).length;
-
-      if (uploadedCount < totalAttachments) {
-        return Text(
-          context.translations.attachmentsUploadProgressText(
-            total: totalAttachments,
-            completed: uploadedCount,
-          ),
-        );
-      }
+    // Shared with the row announcement, so the progress a reader sees and the
+    // progress a screen reader hears are the same number.
+    if (context.translations.attachmentUploadProgressLabel(message) case final label?) {
+      return Text(label);
     }
 
     final channel = StreamChannel.maybeOf(context)?.channel;
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 43bd5d4f7f..05c42cd4f3 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -1377,34 +1377,12 @@ class _MessageRowSemantics extends StatelessWidget {
   }) {
     final translations = context.translations;
 
-    // While attachments upload the footer shows how many are done instead of a
-    // tick. Mirror that rather than flattening it to "Sending", so the
-    // announcement carries the same progress the reader can see.
-    final attachments = message.attachments;
-    if (message.state.isOutgoing && attachments.any((it) => it.type != AttachmentType.urlPreview)) {
-      final uploaded = attachments.where((it) => it.uploadState.isSuccess).length;
-      if (uploaded < attachments.length) {
-        return translations.attachmentsUploadProgressText(
-          completed: uploaded,
-          total: attachments.length,
+    return translations.attachmentUploadProgressLabel(message) ??
+        translations.messageDeliveryStatusLabel(
+          message,
+          isMessageRead: isMessageRead,
+          isMessageDelivered: isMessageDelivered,
         );
-      }
-    }
-
-    final a11y = translations.accessibility;
-
-    // A failed send is shown as a badge on the bubble rather than a footer
-    // tick, and the badge is a bare icon with no text of its own, so without
-    // this the row announces nothing about the failure.
-    if (message.state.isFailed || message.isBouncedWithError) {
-      return a11y.messageFailedStatusLabel;
-    }
-
-    if (isMessageRead) return a11y.messageReadStatusLabel;
-    if (isMessageDelivered) return a11y.messageDeliveredStatusLabel;
-    if (message.state.isCompleted) return a11y.messageSentStatusLabel;
-    if (message.state.isOutgoing) return a11y.messageSendingStatusLabel;
-    return null;
   }
 }
 

From 79ce4d8cf88027a4239b0e60901ab04b0aec4fda Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Thu, 27 Aug 2026 15:04:06 +0200
Subject: [PATCH 16/22] fix(ui): announce message metadata outside a labeled
 message row
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The footer and the message bubble were excluded from the semantics tree
unconditionally, on the assumption that StreamMessageItem always composes a
row label that speaks them. The class doc said as much and asked custom
layouts to re-expose them — but the SDK contains such a layout and it was
never updated: StreamGiphyEphemeralMessage builds StreamMessageFooter
directly, so the giphy preview's timestamp and delivery status announced
nothing at all. Passing an empty semanticsLabel, the documented way to leave
a row unlabeled, silenced a message the same way.

Replace the advisory contract with an enforced one. StreamMessageRowLabelScope
marks a subtree whose metadata a row label already speaks, and the fragments
consult it: inside one they step out of the semantics tree as before, outside
one they announce themselves, since nothing else would. A row only claims the
scope when it actually has a label, so the empty-label escape hatch now hands
the announcement back to the parts instead of dropping it.

Also records why the message text leaves the semantics tree at all. Collapsing
it costs the inline link and mention spans their own nodes, so a screen reader
can read a link but not activate it. That is deliberate: a focus stop per span,
each repeating text the row just spoke, makes every message more tedious to
move through than it makes the rare link easier to reach, and the SwiftUI and
React Native SDKs collapse plain text the same way.

The new tests fail on the parent commit and pass here.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 packages/stream_chat_flutter/CHANGELOG.md     |   2 +
 .../components/stream_message_content.dart    |  27 ++-
 .../components/stream_message_footer.dart     |  40 ++--
 .../message_widget/stream_message_item.dart   |  45 ++++-
 .../stream_message_item_semantics_test.dart   |  23 ++-
 .../stream_message_metadata_test.dart         | 174 ++++++++++++++++++
 6 files changed, 286 insertions(+), 25 deletions(-)
 create mode 100644 packages/stream_chat_flutter/test/src/message_widget/stream_message_metadata_test.dart

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 8bff43f077..12c0c86a67 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -3,11 +3,13 @@
 ✅ Added
 
 - Added `onReactionLongPress` to `StreamMessageItem` and `StreamMessageListView`, reporting the long-pressed message's `BuildContext` and a `ReactionLongPressDetails` with the `message` and `reaction` (the reaction is `null` for a clustered or overflow chip that maps to no single reaction).
+- Added `StreamMessageRowLabelScope`, which marks a subtree whose metadata is already spoken by a composed row label. `StreamMessageFooter` and the message bubble stay out of the semantics tree inside one and announce themselves outside one.
 
 ⚠️ Changed
 
 - Long-pressing a reaction chip no longer opens the message actions modal; the chips always claim the long press. Left unset, `onReactionLongPress` defaults to opening the `ReactionDetailSheet`.
 - Tapping or long-pressing a reaction chip now opens the `ReactionDetailSheet` pre-filtered to that reaction; it previously opened unfiltered. Clustered and overflow chips map to no single reaction, so they still open unfiltered.
+- A deleted message now renders the timestamp and delivery status below the placeholder, matching the design, and no longer shows the "Edited" marker — there is no text left to have been edited.
 
 🔄 Changed
 
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
index 119f9f1934..a22bbb3e68 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart
@@ -5,6 +5,7 @@ import 'package:stream_core_flutter/chat.dart' as core;
 
 import '../../attachment/builder/attachment_widget_builder.dart';
 import '../stream_message_attachments.dart';
+import '../stream_message_item.dart';
 import '../stream_quoted_message.dart';
 import 'stream_message_deleted.dart';
 import 'stream_message_reactions.dart';
@@ -173,6 +174,14 @@ class _StreamMessageContentState extends State<StreamMessageContent> {
     final spacing = context.streamSpacing;
     final crossAxisAlignment = core.StreamMessageLayout.crossAxisAlignmentOf(context);
 
+    // Only a row that speaks its own composed label has already said what the
+    // bubble contains; without one the bubble is all a reader has.
+    final announcedByRow = StreamMessageRowLabelScope.isAnnouncedIn(context);
+    Widget hideFromRow(Widget child) {
+      if (!announcedByRow) return child;
+      return ExcludeSemantics(child: child);
+    }
+
     // A deleted message keeps its metadata: the design shows the timestamp and
     // the delivery status below the placeholder, same as any other message.
     if (widget.message.isDeleted) {
@@ -181,7 +190,7 @@ class _StreamMessageContentState extends State<StreamMessageContent> {
         footer: widget.footer,
         // The composed row label already speaks the placeholder, so announcing
         // it here as well would repeat it.
-        child: const ExcludeSemantics(child: StreamMessageDeleted()),
+        child: hideFromRow(const StreamMessageDeleted()),
       );
     }
 
@@ -224,8 +233,20 @@ class _StreamMessageContentState extends State<StreamMessageContent> {
                         // The composed row label speaks the message text, so
                         // the rendered markdown stays out of the semantics tree
                         // and the row is announced as one phrase.
-                        ExcludeSemantics(
-                          child: StreamMessageText(
+                        //
+                        // This deliberately costs the inline link and mention
+                        // spans their own semantics nodes, so a screen reader
+                        // can read a link but not focus or activate it. The
+                        // alternative — a focus stop per span, each repeating
+                        // text the row just spoke — makes every message far
+                        // more tedious to move through than it makes the rare
+                        // link easier to reach. The SwiftUI and React Native
+                        // SDKs collapse plain text the same way, and reserve
+                        // per-child focus for polls, quotes and attachments,
+                        // which is what `explicitChildNodes` keeps reachable
+                        // here too.
+                        hideFromRow(
+                          StreamMessageText(
                             message: widget.message,
                             onLinkTap: widget.onLinkTap,
                             onMentionTap: widget.onMentionTap,
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
index 88373a6324..698919df9e 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart
@@ -67,11 +67,13 @@ class StreamMessageFooterProps {
 ///  * **Timestamp** — always shown, formatted as a short time string.
 ///  * **Edited label** — when the message text has been updated.
 ///
-/// None of the four contributes to the semantics tree:
-/// [DefaultStreamMessageItem] speaks them all as part of its composed row
-/// label, so announcing them here as well would cost four extra focus stops
-/// per message that repeat what the row already said. A custom message layout
-/// that uses this footer without a row-level label should re-expose them.
+/// Inside a [StreamMessageRowLabelScope] none of the four contributes to the
+/// semantics tree: [DefaultStreamMessageItem] speaks them all as part of its
+/// composed row label, so announcing them here as well would cost four extra
+/// focus stops per message that repeat what the row already said. Outside one
+/// — [StreamGiphyEphemeralMessage], or a custom layout that uses this footer
+/// without a row-level label — they announce themselves, since nothing else
+/// would.
 class DefaultStreamMessageFooter extends StatelessWidget {
   /// Creates a default message footer with the given [props].
   const DefaultStreamMessageFooter({super.key, required this.props});
@@ -85,25 +87,31 @@ class DefaultStreamMessageFooter extends StatelessWidget {
     final currentUser = StreamChat.of(context).currentUser;
     final channelKind = core.StreamMessageLayout.channelKindOf(context);
 
+    // Inside a row that already speaks this metadata every part here would be
+    // a focus stop repeating what the row just said; outside one, dropping
+    // them would leave the metadata unannounced altogether.
+    final announcedByRow = StreamMessageRowLabelScope.isAnnouncedIn(context);
+    Widget hideFromRow(Widget child) {
+      if (!announcedByRow) return child;
+      return ExcludeSemantics(child: child);
+    }
+
     Widget? usernameWidget;
     if (message.user case final user? when channelKind == .group && user.id != currentUser?.id) {
-      usernameWidget = ExcludeSemantics(
-        child: Text(user.name, maxLines: 1, overflow: .ellipsis),
+      usernameWidget = hideFromRow(
+        Text(user.name, maxLines: 1, overflow: .ellipsis),
       );
     }
 
     Widget? statusWidget;
     if (message.user case final user? when user.id == currentUser?.id) {
-      // [DefaultStreamMessageItem] appends the delivery status to its composed
-      // row label, so the icon here would otherwise cost a second focus stop
-      // that announces nothing the row has not already said.
-      statusWidget = ExcludeSemantics(
-        child: StreamMessageSendingStatus(message: message),
+      statusWidget = hideFromRow(
+        StreamMessageSendingStatus(message: message),
       );
     }
 
-    final timestampWidget = ExcludeSemantics(
-      child: StreamTimestamp(
+    final timestampWidget = hideFromRow(
+      StreamTimestamp(
         date: message.createdAt.toLocal(),
         formatter: (context, date) => Jiffy.parseFromDateTime(date).jm,
       ),
@@ -113,8 +121,8 @@ class DefaultStreamMessageFooter extends StatelessWidget {
     // A deleted message has no text left to have been edited, so the marker
     // would describe history the reader can no longer see.
     if (message.messageTextUpdatedAt != null && !message.isDeleted) {
-      editedWidget = ExcludeSemantics(
-        child: Text(context.translations.editedMessageLabel),
+      editedWidget = hideFromRow(
+        Text(context.translations.editedMessageLabel),
       );
     }
 
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 05c42cd4f3..009f9010f3 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -1344,7 +1344,7 @@ class _MessageRowSemantics extends StatelessWidget {
     // leave a row unlabeled, so it counts as having none — otherwise the row
     // would announce a bare ", Sent".
     if (!isOwnMessage || label == null || label.isEmpty) {
-      return Semantics(label: label, explicitChildNodes: true, child: child);
+      return _annotate(label, child);
     }
 
     final channel = StreamChannel.maybeOf(context)?.channel;
@@ -1352,8 +1352,8 @@ class _MessageRowSemantics extends StatelessWidget {
     return BetterStreamBuilder<List<Read>>(
       stream: channel?.state?.readStream,
       initialData: channel?.state?.read,
-      builder: (context, data) => Semantics(
-        label: [
+      builder: (context, data) => _annotate(
+        [
           label,
           ?_statusLabel(
             context,
@@ -1361,12 +1361,20 @@ class _MessageRowSemantics extends StatelessWidget {
             isMessageDelivered: data.deliveriesOf(message: message).isNotEmpty,
           ),
         ].join(', '),
-        explicitChildNodes: true,
-        child: child,
+        child,
       ),
     );
   }
 
+  // Applies [label] to the row, and tells the fragments below that the row
+  // speaks for them. A row with no label of its own makes no such claim, so
+  // its fragments keep announcing themselves.
+  Widget _annotate(String? label, Widget child) {
+    final annotated = Semantics(label: label, explicitChildNodes: true, child: child);
+    if (label == null || label.isEmpty) return annotated;
+    return StreamMessageRowLabelScope(child: annotated);
+  }
+
   // Mirrors what the message shows for the same state — the footer's
   // [StreamMessageSendingStatus], or the error badge on the bubble — so the
   // announcement and the visible state never disagree.
@@ -1386,6 +1394,33 @@ class _MessageRowSemantics extends StatelessWidget {
   }
 }
 
+/// Marks a subtree whose metadata is already spoken by a composed row label.
+///
+/// [StreamMessageItem] announces the whole message row as a single phrase —
+/// sender, body, timestamp, edited marker and delivery status. The widgets
+/// that render those fragments consult this scope to decide whether to stay in
+/// the semantics tree: inside a row that already speaks them they step out, so
+/// the row is announced once instead of once per fragment, and outside one —
+/// [StreamGiphyEphemeralMessage], or any custom layout that reuses these
+/// components — they keep announcing themselves.
+///
+/// See also:
+///
+///  * [DefaultStreamMessageFooter], which excludes its metadata inside this
+///    scope and exposes it outside one.
+class StreamMessageRowLabelScope extends InheritedWidget {
+  /// Marks [child] as announced by an enclosing composed row label.
+  const StreamMessageRowLabelScope({super.key, required super.child});
+
+  /// Whether [context] sits inside a row that speaks its own composed label.
+  static bool isAnnouncedIn(BuildContext context) {
+    return context.dependOnInheritedWidgetOfExactType<StreamMessageRowLabelScope>() != null;
+  }
+
+  @override
+  bool updateShouldNotify(StreamMessageRowLabelScope oldWidget) => false;
+}
+
 StreamMention? _buildMention(Message message, core.StreamMentionType type, String id) {
   return switch (type) {
     .user => message.mentionedUsers.firstWhereOrNull((u) => u.id == id)?.let((user) => StreamUserMention(user: user)),
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index f945ba5ac8..ec2440c3e7 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -457,7 +457,28 @@ void main() {
       // An own message would otherwise have its delivery status appended to
       // nothing, announcing a bare ", Sent".
       expect(labelsOf(tester), isNot(contains(startsWith(','))));
-      expect(labelsOf(tester).where((it) => it.contains('Sent')), isEmpty);
+
+      // The row makes no claim to speak for the message, so the footer keeps
+      // announcing its own parts rather than the message going silent.
+      expect(labelsOf(tester).where((it) => it == 'Sent'), hasLength(1));
+
+      handle.dispose();
+    });
+
+    testWidgets('an empty semanticsLabel leaves the message text audible', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(user: currentUser),
+          semanticsLabel: '',
+          alignment: StreamMessageAlignment.end,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      // Nothing composes a row label to speak the text, so the bubble has to.
+      expect(find.bySemanticsLabel('Are we still meeting tomorrow'), findsOneWidget);
 
       handle.dispose();
     });
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_metadata_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_metadata_test.dart
new file mode 100644
index 0000000000..295cfcc68a
--- /dev/null
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_metadata_test.dart
@@ -0,0 +1,174 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+import 'package:stream_chat_flutter/src/message_widget/components/stream_message_sending_status.dart';
+import 'package:stream_chat_flutter/stream_chat_flutter.dart';
+
+import '../mocks.dart';
+
+void main() {
+  final currentUser = OwnUser(id: 'me', name: 'Luke Skywalker');
+  final otherUser = User(id: 'han', name: 'Han Solo');
+
+  Widget wrap(Widget body) {
+    final client = MockClient();
+    final clientState = MockClientState();
+    final channel = MockChannel();
+    final channelState = MockChannelState();
+
+    when(() => client.state).thenReturn(clientState);
+    when(() => clientState.currentUser).thenReturn(currentUser);
+    when(() => clientState.currentUserStream).thenAnswer((_) => Stream.value(currentUser));
+    when(() => channel.client).thenReturn(client);
+    when(() => channel.state).thenReturn(channelState);
+    when(() => channelState.readStream).thenAnswer((_) => Stream.value(const []));
+
+    return MaterialApp(
+      home: StreamChat(
+        client: client,
+        connectivityStream: Stream.value(const [ConnectivityResult.mobile]),
+        child: StreamChannel(
+          channel: channel,
+          child: Scaffold(
+            body: StreamMessageLayout(
+              data: const StreamMessageLayoutData(alignment: StreamMessageAlignment.end),
+              child: Align(alignment: Alignment.topLeft, child: body),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Message message({
+    User? user,
+    DateTime? messageTextUpdatedAt,
+  }) {
+    return Message(
+      id: 'test-message',
+      text: 'Are we still meeting tomorrow',
+      createdAt: DateTime(2026, 8, 26, 15),
+      user: user ?? currentUser,
+      state: MessageState.sent,
+      messageTextUpdatedAt: messageTextUpdatedAt,
+    );
+  }
+
+  List<String> labelsOf(WidgetTester tester) {
+    return tester.semantics.simulatedAccessibilityTraversal().map((it) => it.label).toList();
+  }
+
+  group('deleted message metadata', () {
+    final deleted = Message(
+      id: 'deleted-message',
+      type: MessageType.deleted,
+      createdAt: DateTime(2026, 8, 26, 15),
+      deletedAt: DateTime(2026, 8, 26, 16),
+      user: currentUser,
+      state: MessageState.sent,
+      messageTextUpdatedAt: DateTime(2026, 8, 26, 15, 30),
+    );
+
+    // The design shows a deleted message with the same timestamp and delivery
+    // status as any other. Asserting on the composed label alone would pass
+    // even if the footer stopped rendering, since the label is built from the
+    // message rather than from what was laid out.
+    testWidgets('renders the footer below the placeholder', (tester) async {
+      await tester.pumpWidget(wrap(StreamMessageItem(message: deleted)));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(StreamMessageFooter), findsOneWidget);
+      expect(find.byType(StreamTimestamp), findsOneWidget);
+    });
+
+    testWidgets('renders the delivery status below the placeholder', (tester) async {
+      await tester.pumpWidget(wrap(StreamMessageItem(message: deleted)));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(StreamMessageSendingStatus), findsOneWidget);
+    });
+
+    testWidgets('drops the edited marker', (tester) async {
+      await tester.pumpWidget(wrap(StreamMessageItem(message: deleted)));
+      await tester.pumpAndSettle();
+
+      // There is no text left to have been edited, so the marker would
+      // describe history the reader can no longer see.
+      final edited = DefaultTranslations.instance.editedMessageLabel;
+      expect(find.text(edited), findsNothing);
+    });
+
+    testWidgets('keeps the edited marker on a message that still has text', (tester) async {
+      await tester.pumpWidget(
+        wrap(StreamMessageItem(message: message(messageTextUpdatedAt: DateTime(2026, 8, 26, 15, 30)))),
+      );
+      await tester.pumpAndSettle();
+
+      final edited = DefaultTranslations.instance.editedMessageLabel;
+      expect(find.text(edited), findsOneWidget);
+    });
+  });
+
+  group('footer semantics outside a labeled row', () {
+    // StreamGiphyEphemeralMessage builds a footer without going through
+    // StreamMessageItem, so nothing composes a row label to speak its
+    // metadata. Excluding the footer there would leave it announcing nothing
+    // at all.
+    testWidgets('announces its own parts', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(wrap(StreamMessageFooter(message: message())));
+      await tester.pumpAndSettle();
+
+      final a11y = DefaultTranslations.instance.accessibility;
+      expect(labelsOf(tester), contains(a11y.messageSentStatusLabel));
+
+      handle.dispose();
+    });
+
+    testWidgets('announces the timestamp', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(wrap(StreamMessageFooter(message: message())));
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester).where((it) => it.contains('3:00 PM')), isNotEmpty);
+
+      handle.dispose();
+    });
+
+    testWidgets('stays silent inside a row that speaks for it', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(wrap(StreamMessageItem(message: message())));
+      await tester.pumpAndSettle();
+
+      // The row label ends with the status, so the footer announcing it again
+      // would cost a second stop that repeats what the row just said.
+      final a11y = DefaultTranslations.instance.accessibility;
+      final sent = labelsOf(tester).where((it) => it.contains(a11y.messageSentStatusLabel));
+      expect(sent, hasLength(1));
+      expect(sent.single, isNot(equals(a11y.messageSentStatusLabel)));
+
+      handle.dispose();
+    });
+
+    testWidgets('announces the author name that a labeled row would suppress', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        wrap(
+          StreamMessageLayout(
+            data: const StreamMessageLayoutData(channelKind: StreamMessageChannelKind.group),
+            child: StreamMessageFooter(message: message(user: otherUser)),
+          ),
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester), contains('Han Solo'));
+
+      handle.dispose();
+    });
+  });
+}

From 6d25b63bbdcb340874df18b09f71b4f61fcc0220 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Thu, 27 Aug 2026 15:04:43 +0200
Subject: [PATCH 17/22] fix(ui): keep an own message rendered before its
 channel is watched
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The row announcement tracks ChannelClientState.readStream so the delivery
status it speaks stays in step with the icon in the footer. It reads that
stream through a BetterStreamBuilder with no noDataBuilder, which falls back
to SizedBox.shrink() when it has no event — and the builder wraps the row's
child, so the whole message disappeared rather than just the status.

Channel.state is null until the channel is watched, and StreamChannel renders
its child during that window when showLoading is false, so an own message
could render as an empty box in a supported configuration. A probe against
master finds the message text; on the parent commit it finds nothing.

The same pattern is used in StreamMessageSendingStatus, where losing the
subtree only costs a tick icon; wrapping the row content in it is what made
it harmful. Fall back to the row with its label and no status, which is what
the footer shows in the same state.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../message_widget/stream_message_item.dart   |  4 ++
 .../stream_message_item_semantics_test.dart   | 41 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 009f9010f3..1f0a652c4e 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -1352,6 +1352,10 @@ class _MessageRowSemantics extends StatelessWidget {
     return BetterStreamBuilder<List<Read>>(
       stream: channel?.state?.readStream,
       initialData: channel?.state?.read,
+      // Read state is null until the channel is watched, and a channel can be
+      // rendered before then. Without this the row itself — not just the
+      // status it would have carried — would drop out of the tree.
+      noDataBuilder: (_) => _annotate(label, child),
       builder: (context, data) => _annotate(
         [
           label,
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index ec2440c3e7..679699f422 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -100,6 +100,9 @@ void main() {
       OwnUser? reader,
       bool signedIn = true,
       StreamMessageAlignment alignment = StreamMessageAlignment.start,
+      // Set to true to render a channel that has not been watched yet, whose
+      // read state is therefore unavailable.
+      bool unwatchedChannel = false,
       // Set to false to resolve the shipped English strings instead of the
       // sentinels, pinning what a user actually hears.
       bool fakeTranslations = true,
@@ -117,7 +120,7 @@ void main() {
       when(() => clientState.currentUser).thenReturn(effectiveReader);
       when(() => clientState.currentUserStream).thenAnswer((_) => Stream.value(effectiveReader));
       when(() => channel.client).thenReturn(client);
-      when(() => channel.state).thenReturn(channelState);
+      when(() => channel.state).thenReturn(unwatchedChannel ? null : channelState);
       when(() => channelState.readStream).thenAnswer((_) => Stream.value(const []));
 
       return MaterialApp(
@@ -130,6 +133,7 @@ void main() {
           connectivityStream: Stream.value(const [ConnectivityResult.mobile]),
           child: StreamChannel(
             channel: channel,
+            showLoading: false,
             child: Scaffold(
               body: StreamMessageLayout(
                 data: StreamMessageLayoutData(alignment: alignment),
@@ -442,6 +446,41 @@ void main() {
       handle.dispose();
     });
 
+    testWidgets('renders an own message before the channel has been watched', (tester) async {
+      // The row label tracks the read state to announce a delivery status, and
+      // that state is null until the channel is watched. Reading it must not
+      // cost the row the message it was wrapping.
+      await tester.pumpWidget(
+        buildScene(
+          message(user: currentUser),
+          alignment: StreamMessageAlignment.end,
+          unwatchedChannel: true,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(find.text('Are we still meeting tomorrow'), findsOneWidget);
+    });
+
+    testWidgets('announces an own message without a status before the channel has been watched', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(
+          message(user: currentUser),
+          alignment: StreamMessageAlignment.end,
+          unwatchedChannel: true,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      // No read state means no status to mirror, so the row announces what it
+      // does know rather than a status it cannot verify.
+      expect(labelsOf(tester), contains('OUT:Are we still meeting tomorrow, AT-TIME'));
+
+      handle.dispose();
+    });
+
     testWidgets('an empty semanticsLabel leaves the row unlabeled', (tester) async {
       final handle = tester.ensureSemantics();
 

From 06d4864913b54ebcbeb327073ae637a3600481e4 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Thu, 27 Aug 2026 15:05:18 +0200
Subject: [PATCH 18/22] fix(ui): announce the delivery status only when the
 message shows one
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The row label appended a delivery status to every own message, without
consulting the resolved metadata visibility. A stacked message at the top or
middle of a run hides its footer entirely, so the row announced a "Sent" that
is nowhere on screen — the opposite of the rule the rest of the announcement
follows, that it mirrors what was rendered.

Gate the status on whether the footer was actually built. The timestamp stays
unconditional: it is the one piece worth announcing even when hidden, so that
landing on a message in the middle of a run still tells you when it was sent.
That split matches the SwiftUI SDK, whose accessibilityLabel(showsAllInfo:)
always speaks the sender and time and appends the delivery status only for
the message that displays it.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../message_widget/stream_message_item.dart   | 18 +++++++++++----
 .../stream_message_item_semantics_test.dart   | 23 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index 1f0a652c4e..e61ddf888e 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -641,6 +641,7 @@ class DefaultStreamMessageItem extends StatelessWidget {
         child: _MessageRowSemantics(
           message: message,
           label: effectiveSemanticsLabel,
+          showsMetadata: footerWidget != null,
           child: Align(
             alignment: StreamMessageLayout.alignmentDirectionalOf(context),
             child: Padding(
@@ -1320,11 +1321,17 @@ class _MessageRowSemantics extends StatelessWidget {
   const _MessageRowSemantics({
     required this.message,
     required this.label,
+    required this.showsMetadata,
     required this.child,
   });
 
   final Message message;
   final String? label;
+
+  // Whether the row renders its metadata footer. A stacked message hides it,
+  // and so has no delivery status on screen to announce.
+  final bool showsMetadata;
+
   final Widget child;
 
   @override
@@ -1339,11 +1346,12 @@ class _MessageRowSemantics extends StatelessWidget {
       _ => false,
     };
 
-    // Only the sender sees a delivery status, and a row with no label of its
-    // own has nothing to append it to. An empty label is the documented way to
-    // leave a row unlabeled, so it counts as having none — otherwise the row
-    // would announce a bare ", Sent".
-    if (!isOwnMessage || label == null || label.isEmpty) {
+    // Only the sender sees a delivery status, only a row that renders the
+    // footer shows one, and a row with no label of its own has nothing to
+    // append it to. An empty label is the documented way to leave a row
+    // unlabeled, so it counts as having none — otherwise the row would
+    // announce a bare ", Sent".
+    if (!isOwnMessage || !showsMetadata || label == null || label.isEmpty) {
       return _annotate(label, child);
     }
 
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index 679699f422..47cd82cc51 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -100,6 +100,7 @@ void main() {
       OwnUser? reader,
       bool signedIn = true,
       StreamMessageAlignment alignment = StreamMessageAlignment.start,
+      StreamMessageStackPosition stackPosition = StreamMessageStackPosition.single,
       // Set to true to render a channel that has not been watched yet, whose
       // read state is therefore unavailable.
       bool unwatchedChannel = false,
@@ -136,7 +137,7 @@ void main() {
             showLoading: false,
             child: Scaffold(
               body: StreamMessageLayout(
-                data: StreamMessageLayoutData(alignment: alignment),
+                data: StreamMessageLayoutData(alignment: alignment, stackPosition: stackPosition),
                 child: StreamMessageItem(
                   message: message,
                   semanticsLabel: semanticsLabel,
@@ -481,6 +482,26 @@ void main() {
       handle.dispose();
     });
 
+    testWidgets('omits the delivery status when the message does not show one', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      // A stacked message hides its metadata, so there is no status on screen
+      // for the announcement to mirror.
+      await tester.pumpWidget(
+        buildScene(
+          message(user: currentUser),
+          alignment: StreamMessageAlignment.end,
+          stackPosition: StreamMessageStackPosition.middle,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester), contains('OUT:Are we still meeting tomorrow, AT-TIME'));
+      expect(labelsOf(tester).where((it) => it.contains('Sent')), isEmpty);
+
+      handle.dispose();
+    });
+
     testWidgets('an empty semanticsLabel leaves the row unlabeled', (tester) async {
       final handle = tester.ensureSemantics();
 

From 6519a1e20d79ebf51b47e65b450c6a66d13cb2e6 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Thu, 27 Aug 2026 15:05:57 +0200
Subject: [PATCH 19/22] fix(ui): announce the rendered message text, not its
 markdown source

The row label took the message text straight from the model, so a screen
reader spelled out markdown syntax the bubble had already resolved. A message
reading "check our docs and this now" on screen announced as

  check [our docs](https://getstream.io) and **this** now

with the brackets, the parens and the whole URL read aloud. Every message
carrying a link, bold, code or a heading was affected. Before this branch
RenderParagraph announced the rendered text, so this was a regression.

Resolve the text through the markdown parser and take the plain text it
renders as, using the same gitHubFlavored extension set MarkdownBody defaults
to. markdown was already in the dependency graph through flutter_markdown;
this declares it directly, via melos.yaml.

Verified on device as well as in tests: the same message now announces as
"You said, Link\ncheck our docs and this now, Just now, Sent".

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 melos.yaml                                    |  1 +
 packages/stream_chat_flutter/CHANGELOG.md     |  2 +-
 .../message_widget/stream_message_item.dart   | 10 ++++++-
 .../lib/src/utils/extensions.dart             | 25 +++++++++++++++++
 packages/stream_chat_flutter/pubspec.yaml     |  1 +
 .../stream_message_item_semantics_test.dart   | 28 +++++++++++++++++++
 6 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index 4172629cd9..d44ae5d286 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -78,6 +78,7 @@ command:
       latlong2: ^0.9.1
       logging: ^1.3.0
       lottie: ^3.3.3
+      markdown: ^7.3.0
       marionette_flutter: ^0.6.0
       media_kit: ^1.2.6
       media_kit_libs_video: ^1.0.6
diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 12c0c86a67..d32ef8d21c 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -17,7 +17,7 @@
 
 🐞 Fixed
 
-- Improved the screen-reader experience in the message list. Each message is announced as a single phrase naming the sender and the direction ("You said, …" / "<name> said, …") together with the body, the time, the edited marker and the delivery status — including upload progress and a failure to send — while the attachments, reaction chips, quoted message and replies row stay reachable one level deeper. Quoted messages say who replied to whom, attachment tiles announce their type and position in a gallery, date dividers announce the date they show — as a header — instead of a time they never showed, and a deleted message names who deleted it and keeps its timestamp and delivery status. `StreamMessageItem.semanticsLabel` and `StreamQuotedMessage.replyMessage` are new and let you adjust the composed announcements; a custom `messageBuilder` replaces the default layout and is responsible for its own label.
+- Improved the screen-reader experience in the message list. Each message is announced as a single phrase naming the sender and the direction ("You said, …" / "<name> said, …") together with the body, the time, the edited marker and the delivery status — including upload progress and a failure to send — while the attachments, reaction chips, quoted message and replies row stay reachable one level deeper. The body is announced as the text the bubble renders, so markdown link and emphasis syntax is no longer read aloud. Quoted messages say who replied to whom, attachment tiles announce their type and position in a gallery, date dividers announce the date they show — as a header — instead of a time they never showed, and a deleted message names who deleted it and keeps its timestamp and delivery status. `StreamMessageItem.semanticsLabel` and `StreamQuotedMessage.replyMessage` are new and let you adjust the composed announcements; a custom `messageBuilder` replaces the default layout and is responsible for its own label.
 - Fixed a crash on web when the message list rebuilt while messages were selectable, for example after opening the attachment picker.
 - Fixed the browser's native context menu reappearing over the message context menu on web after scrolling messages out of view or deleting one.
 - Fixed the SDK re-enabling the browser's native context menu on web in apps that had disabled it themselves.
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
index e61ddf888e..c8fb6d261f 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart
@@ -762,7 +762,15 @@ class DefaultStreamMessageItem extends StatelessWidget {
       false => message,
     };
 
-    final announced = shown.replaceMentions(linkify: false);
+    final withMentions = shown.replaceMentions(linkify: false);
+
+    // The bubble renders the text as markdown. Announcing the source would
+    // spell out the bracket and paren syntax and read whole URLs aloud, so it
+    // is resolved to the text that is actually on screen.
+    final announced = switch (withMentions.text) {
+      final text? when text.isNotEmpty => withMentions.copyWith(text: text.markdownToPlainText),
+      _ => withMentions,
+    };
 
     return switch (formatter) {
       final AccessibleMessagePreviewFormatter it => it.formatMessageSemanticsLabel(
diff --git a/packages/stream_chat_flutter/lib/src/utils/extensions.dart b/packages/stream_chat_flutter/lib/src/utils/extensions.dart
index a3cc755e77..a4b94e4d54 100644
--- a/packages/stream_chat_flutter/lib/src/utils/extensions.dart
+++ b/packages/stream_chat_flutter/lib/src/utils/extensions.dart
@@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:image_size_getter/file_input.dart'; // For compatibility with flutter web.
 import 'package:image_size_getter/image_size_getter.dart' hide Size;
+import 'package:markdown/markdown.dart' as md;
 
 import '../../stream_chat_flutter.dart';
 import '../audio/audio_playlist_state.dart';
@@ -47,6 +48,30 @@ extension StringExtension on String {
   @Deprecated('Use sentenceCase instead')
   String capitalize() => sentenceCase;
 
+  /// Returns this markdown source as the plain text it renders as.
+  ///
+  /// Link and image syntax collapses to the text a reader sees, emphasis and
+  /// heading markers drop away, and the remaining blocks are joined by a
+  /// newline. `check [our docs](https://getstream.io)` becomes
+  /// `check our docs`.
+  ///
+  /// Announcing the source instead would spell out bracket and paren syntax
+  /// and read whole URLs aloud, so screen-reader labels derived from message
+  /// text pass through here first. Parsed with the same extension set that
+  /// `MarkdownBody` defaults to, so the result matches what was rendered.
+  String get markdownToPlainText {
+    if (trim().isEmpty) return this;
+
+    final document = md.Document(
+      extensionSet: md.ExtensionSet.gitHubFlavored,
+      encodeHtml: false,
+    );
+
+    final blocks = document.parse(this).map((it) => it.textContent.trim()).where((it) => it.isNotEmpty);
+
+    return blocks.join('\n');
+  }
+
   /// Returns the string in sentence case.
   ///
   /// Example: 'hello WORLD' -> 'Hello world'
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index bba0f2a0f3..8815b3d2af 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -45,6 +45,7 @@ dependencies:
   jiffy: ^6.4.5
   just_audio: ^0.10.5
   lottie: ^3.3.3
+  markdown: ^7.3.0
   meta: ^1.9.1
   path_provider: ^2.1.5
   photo_manager: ^3.9.0
diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
index 47cd82cc51..dbf1ae333f 100644
--- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
+++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_semantics_test.dart
@@ -502,6 +502,34 @@ void main() {
       handle.dispose();
     });
 
+    testWidgets('announces the rendered text rather than its markdown source', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(message(text: 'check [our docs](https://getstream.io) now')),
+      );
+      await tester.pumpAndSettle();
+
+      // The bubble renders "check our docs now"; announcing the source would
+      // spell out the brackets and read the whole URL aloud.
+      expect(labelsOf(tester), contains('IN:Han Solo:check our docs now, AT-TIME'));
+
+      handle.dispose();
+    });
+
+    testWidgets('announces emphasised text without its markers', (tester) async {
+      final handle = tester.ensureSemantics();
+
+      await tester.pumpWidget(
+        buildScene(message(text: 'that is **really** important')),
+      );
+      await tester.pumpAndSettle();
+
+      expect(labelsOf(tester), contains('IN:Han Solo:that is really important, AT-TIME'));
+
+      handle.dispose();
+    });
+
     testWidgets('an empty semanticsLabel leaves the row unlabeled', (tester) async {
       final handle = tester.ensureSemantics();
 

From 6b45dc47714cd04ec4760133bd5202ff10405768 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Thu, 27 Aug 2026 15:06:49 +0200
Subject: [PATCH 20/22] fix(localizations): conjugate the quoted-reply labels
 for whoever replied
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The quoted-message announcement built one third-person sentence and dropped
the word for "you" into it when the replier was the current user. Every
locale had written the template in the third person, so the substitution
produced text no native speaker would write:

  de  "Du hat auf deine Nachricht geantwortet"   (must be "hast")
  fr  "Vous a répondu au message de …"           (must be "avez répondu")
  it  "te ha risposto al tuo messaggio"          (oblique subject, wrong verb)

Spanish and Catalan mixed a formal subject with an informal possessive, and
Korean and Hindi produced "당신님이" and "आप ने" where the pronoun should
fuse with the particle.

Split the pair into four labels — outgoing/incoming against the quoted
message being the reader's own or someone else's — so each locale writes a
complete sentence and conjugates it itself. This is the same shape the branch
already uses for outgoingMessageLabel / incomingMessageLabel, and the shape
Android Compose uses for its own sender descriptions.

The English strings are unchanged: "You replied to your message" matches the
Android Compose wording for the same case.

These labels are new on this branch and unreleased, so the old pair is
replaced rather than deprecated.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../accessibility_translations.dart           | 58 ++++++++++++++-----
 .../message_widget/stream_quoted_message.dart | 45 ++++++++++----
 .../stream_chat_localizations/CHANGELOG.md    |  2 +-
 .../lib/src/stream_chat_localizations_ca.dart | 10 +++-
 .../lib/src/stream_chat_localizations_de.dart | 12 +++-
 .../lib/src/stream_chat_localizations_en.dart | 10 +++-
 .../lib/src/stream_chat_localizations_es.dart | 10 +++-
 .../lib/src/stream_chat_localizations_fr.dart | 10 +++-
 .../lib/src/stream_chat_localizations_hi.dart | 10 +++-
 .../lib/src/stream_chat_localizations_it.dart | 10 +++-
 .../lib/src/stream_chat_localizations_ja.dart | 10 +++-
 .../lib/src/stream_chat_localizations_ko.dart | 10 +++-
 .../lib/src/stream_chat_localizations_no.dart | 10 +++-
 .../lib/src/stream_chat_localizations_pt.dart | 10 +++-
 .../test/translations_test.dart               |  6 +-
 15 files changed, 172 insertions(+), 51 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
index 2332ea3e0b..faec123fee 100644
--- a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
+++ b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart
@@ -120,22 +120,42 @@ abstract class AccessibilityTranslations {
   /// `title` when set.
   String imageAttachmentLabel({String? title});
 
-  /// The screen-reader label for a quoted-message preview whose quoted
-  /// message the current user wrote, e.g. `"Han Solo replied to your
-  /// message"`.
+  /// The screen-reader label for a quoted-message preview where the current
+  /// user replied to their own message, e.g. `"You replied to your message"`.
   ///
-  /// [replierName] is the author of the message doing the quoting, already
-  /// resolved to the word for "you" when that is the current user. Combined
-  /// with the quoted body as `"Han Solo replied to your message, see you
+  /// Combined with the quoted body as `"You replied to your message, see you
   /// tomorrow"`.
-  String repliedToOwnMessageLabel({required String replierName});
+  ///
+  /// The four reply labels are split by who replied rather than composed from
+  /// a word for "you", because a locale that inflects its verb for person
+  /// cannot conjugate a name it is handed at runtime: German needs "Du hast
+  /// geantwortet" against "Han Solo hat geantwortet", and substituting "Du"
+  /// into the third-person form yields "Du hat geantwortet".
+  String outgoingReplyToOwnMessageLabel();
+
+  /// The screen-reader label for a quoted-message preview where the current
+  /// user replied to [authorName]'s message, e.g. `"You replied to Leia's
+  /// message"`.
+  ///
+  /// See [outgoingReplyToOwnMessageLabel] for why the direction is part of the
+  /// method rather than a substituted name. [authorName] is part of the string
+  /// so every locale can form the possessive itself.
+  String outgoingReplyToMessageLabel({required String authorName});
+
+  /// The screen-reader label for a quoted-message preview where [replierName]
+  /// replied to the current user's message, e.g. `"Han Solo replied to your
+  /// message"`.
+  ///
+  /// [replierName] is the author of the message doing the quoting.
+  String incomingReplyToOwnMessageLabel({required String replierName});
 
-  /// The screen-reader label for a quoted-message preview whose quoted
-  /// message [authorName] wrote, e.g. `"You replied to Leia's message"`.
+  /// The screen-reader label for a quoted-message preview where [replierName]
+  /// replied to [authorName]'s message, e.g. `"Han Solo replied to Leia's
+  /// message"`.
   ///
-  /// See [repliedToOwnMessageLabel] for [replierName]. Both names are part of
-  /// the string so every locale can form the possessive itself.
-  String repliedToMessageLabel({
+  /// Both names are part of the string so every locale can form the possessive
+  /// itself.
+  String incomingReplyToMessageLabel({
     required String replierName,
     required String authorName,
   });
@@ -493,12 +513,22 @@ class DefaultAccessibilityTranslations extends AccessibilityTranslations {
   }
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) {
+  String outgoingReplyToOwnMessageLabel() {
+    return 'You replied to your message';
+  }
+
+  @override
+  String outgoingReplyToMessageLabel({required String authorName}) {
+    return "You replied to $authorName's message";
+  }
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) {
     return '$replierName replied to your message';
   }
 
   @override
-  String repliedToMessageLabel({
+  String incomingReplyToMessageLabel({
     required String replierName,
     required String authorName,
   }) {
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart
index 2c638bc401..e9515af6ff 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart
@@ -131,33 +131,54 @@ class DefaultStreamQuotedMessage extends StatelessWidget {
   // Describes the reply relationship the preview stands for: who replied, and
   // whose message they replied to. Returns null when there is no replying
   // message to attribute, leaving the author's name to be announced as shown.
+  //
+  // The current user replying is a separate label rather than their name
+  // swapped for the word "you", so a locale can conjugate the verb for the
+  // person doing the replying.
   String? _semanticsLabel(BuildContext context) {
     final replyMessage = props.replyMessage;
     if (replyMessage == null) return null;
 
-    final translations = context.translations;
-    final a11y = translations.accessibility;
+    final replier = replyMessage.user;
+    if (replier == null) return null;
+
+    final quotedAuthor = props.quotedMessage.user;
+    if (quotedAuthor == null) return null;
+
+    final a11y = context.translations.accessibility;
     final currentUser = StreamChat.maybeOf(context)?.currentUser;
 
-    final replier = switch (replyMessage.user) {
-      final user? when user.id == currentUser?.id => translations.youText,
-      final user? when user.name.trim().isNotEmpty => user.name.trim(),
-      _ => null,
+    // Compared as nullables, an authorless message read by nobody signed in
+    // would match on `null == null` and be announced as the reader's own.
+    bool isCurrentUser(User user) => switch (currentUser) {
+      final reader? => user.id == reader.id,
+      _ => false,
     };
 
-    if (replier == null) return null;
+    final repliedToOwnMessage = isCurrentUser(quotedAuthor);
 
-    final quotedAuthor = props.quotedMessage.user;
-    if (quotedAuthor == null) return null;
+    if (isCurrentUser(replier)) {
+      if (repliedToOwnMessage) return a11y.outgoingReplyToOwnMessageLabel();
+
+      final authorName = quotedAuthor.name.trim();
+      if (authorName.isEmpty) return null;
+
+      return a11y.outgoingReplyToMessageLabel(authorName: authorName);
+    }
+
+    // With no name there is nothing to attribute the reply to, so the preview
+    // falls back to announcing the author's name as shown.
+    final replierName = replier.name.trim();
+    if (replierName.isEmpty) return null;
 
-    if (quotedAuthor.id == currentUser?.id) {
-      return a11y.repliedToOwnMessageLabel(replierName: replier);
+    if (repliedToOwnMessage) {
+      return a11y.incomingReplyToOwnMessageLabel(replierName: replierName);
     }
 
     final authorName = quotedAuthor.name.trim();
     if (authorName.isEmpty) return null;
 
-    return a11y.repliedToMessageLabel(replierName: replier, authorName: authorName);
+    return a11y.incomingReplyToMessageLabel(replierName: replierName, authorName: authorName);
   }
 
   @override
diff --git a/packages/stream_chat_localizations/CHANGELOG.md b/packages/stream_chat_localizations/CHANGELOG.md
index 9b19e67410..9077fbda4c 100644
--- a/packages/stream_chat_localizations/CHANGELOG.md
+++ b/packages/stream_chat_localizations/CHANGELOG.md
@@ -3,7 +3,7 @@
 ✅ Added
 
 - Added message-translation strings for all supported locales: `translatedLabel`, `originalLabel`, `showOriginalLabel`, `showTranslationLabel`, and `translatedFromLanguageText(String languageCode)`, which names the source language of a translated message in the current locale.
-- Added the message-list a11y strings behind the new screen-reader announcements: `outgoingMessageLabel` / `incomingMessageLabel`, `outgoingDeletedMessageLabel` / `incomingDeletedMessageLabel`, `repliedToOwnMessageLabel` / `repliedToMessageLabel`, `attachmentPositionLabel`, and `messageFailedStatusLabel`. Every supported locale ships a native-language implementation.
+- Added the message-list a11y strings behind the new screen-reader announcements: `outgoingMessageLabel` / `incomingMessageLabel`, `outgoingDeletedMessageLabel` / `incomingDeletedMessageLabel`, `outgoingReplyToOwnMessageLabel` / `outgoingReplyToMessageLabel` / `incomingReplyToOwnMessageLabel` / `incomingReplyToMessageLabel`, `attachmentPositionLabel`, and `messageFailedStatusLabel`. Every supported locale ships a native-language implementation. The four reply labels are split by who replied rather than composed from a word for "you", so a locale that inflects its verb for person can conjugate it.
 
 🔄 Changed
 
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
index f51ab00513..6a3e4ea199 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
@@ -967,10 +967,16 @@ class _AccessibilityTranslationsCa extends AccessibilityTranslations {
   String attachmentPositionLabel({required int index, required int total}) => '$index de $total';
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) => '$replierName ha respost al teu missatge';
+  String outgoingReplyToOwnMessageLabel() => 'Has respost al teu propi missatge';
 
   @override
-  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+  String outgoingReplyToMessageLabel({required String authorName}) => 'Has respost al missatge de $authorName';
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) => '$replierName ha respost al teu missatge';
+
+  @override
+  String incomingReplyToMessageLabel({required String replierName, required String authorName}) =>
       '$replierName ha respost al missatge de $authorName';
 
   @override
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
index 07aa864b0c..74a5ff9b6f 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
@@ -965,10 +965,18 @@ class _AccessibilityTranslationsDe extends AccessibilityTranslations {
   String attachmentPositionLabel({required int index, required int total}) => '$index von $total';
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) => '$replierName hat auf deine Nachricht geantwortet';
+  String outgoingReplyToOwnMessageLabel() => 'Du hast auf deine eigene Nachricht geantwortet';
 
   @override
-  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+  String outgoingReplyToMessageLabel({required String authorName}) =>
+      'Du hast auf die Nachricht von $authorName geantwortet';
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) =>
+      '$replierName hat auf deine Nachricht geantwortet';
+
+  @override
+  String incomingReplyToMessageLabel({required String replierName, required String authorName}) =>
       '$replierName hat auf die Nachricht von $authorName geantwortet';
 
   @override
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
index 3895a27b37..905e70069f 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
@@ -965,10 +965,16 @@ class _AccessibilityTranslationsEn extends AccessibilityTranslations {
   String attachmentPositionLabel({required int index, required int total}) => '$index of $total';
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) => '$replierName replied to your message';
+  String outgoingReplyToOwnMessageLabel() => 'You replied to your message';
 
   @override
-  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+  String outgoingReplyToMessageLabel({required String authorName}) => "You replied to $authorName's message";
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) => '$replierName replied to your message';
+
+  @override
+  String incomingReplyToMessageLabel({required String replierName, required String authorName}) =>
       "$replierName replied to $authorName's message";
 
   @override
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
index cfcbb8db30..716130d2ae 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
@@ -969,10 +969,16 @@ class _AccessibilityTranslationsEs extends AccessibilityTranslations {
   String attachmentPositionLabel({required int index, required int total}) => '$index de $total';
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) => '$replierName respondió a tu mensaje';
+  String outgoingReplyToOwnMessageLabel() => 'Respondiste a tu propio mensaje';
 
   @override
-  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+  String outgoingReplyToMessageLabel({required String authorName}) => 'Respondiste al mensaje de $authorName';
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) => '$replierName respondió a tu mensaje';
+
+  @override
+  String incomingReplyToMessageLabel({required String replierName, required String authorName}) =>
       '$replierName respondió al mensaje de $authorName';
 
   @override
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
index f2a2e83e22..c34a03938c 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
@@ -971,10 +971,16 @@ class _AccessibilityTranslationsFr extends AccessibilityTranslations {
   String attachmentPositionLabel({required int index, required int total}) => '$index sur $total';
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) => '$replierName a répondu à votre message';
+  String outgoingReplyToOwnMessageLabel() => 'Vous avez répondu à votre propre message';
 
   @override
-  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+  String outgoingReplyToMessageLabel({required String authorName}) => 'Vous avez répondu au message de $authorName';
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) => '$replierName a répondu à votre message';
+
+  @override
+  String incomingReplyToMessageLabel({required String replierName, required String authorName}) =>
       '$replierName a répondu au message de $authorName';
 
   @override
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
index f5f1fa25cf..a538ffebf1 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
@@ -966,10 +966,16 @@ class _AccessibilityTranslationsHi extends AccessibilityTranslations {
   String attachmentPositionLabel({required int index, required int total}) => '$total में से $index';
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) => '$replierName ने आपके संदेश का उत्तर दिया';
+  String outgoingReplyToOwnMessageLabel() => 'आपने अपने संदेश का उत्तर दिया';
 
   @override
-  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+  String outgoingReplyToMessageLabel({required String authorName}) => 'आपने $authorName के संदेश का उत्तर दिया';
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) => '$replierName ने आपके संदेश का उत्तर दिया';
+
+  @override
+  String incomingReplyToMessageLabel({required String replierName, required String authorName}) =>
       '$replierName ने $authorName के संदेश का उत्तर दिया';
 
   @override
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
index 6e39f5d23f..3750dd2c73 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
@@ -979,10 +979,16 @@ class _AccessibilityTranslationsIt extends AccessibilityTranslations {
   String attachmentPositionLabel({required int index, required int total}) => '$index di $total';
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) => '$replierName ha risposto al tuo messaggio';
+  String outgoingReplyToOwnMessageLabel() => 'Hai risposto al tuo stesso messaggio';
 
   @override
-  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+  String outgoingReplyToMessageLabel({required String authorName}) => 'Hai risposto al messaggio di $authorName';
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) => '$replierName ha risposto al tuo messaggio';
+
+  @override
+  String incomingReplyToMessageLabel({required String replierName, required String authorName}) =>
       '$replierName ha risposto al messaggio di $authorName';
 
   @override
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
index 968b1a43dd..7df754596c 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
@@ -944,10 +944,16 @@ class _AccessibilityTranslationsJa extends AccessibilityTranslations {
   String attachmentPositionLabel({required int index, required int total}) => '$total件中$index件目';
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) => '$replierNameがあなたのメッセージに返信しました';
+  String outgoingReplyToOwnMessageLabel() => '自分のメッセージに返信しました';
 
   @override
-  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+  String outgoingReplyToMessageLabel({required String authorName}) => '$authorNameのメッセージに返信しました';
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) => '$replierNameがあなたのメッセージに返信しました';
+
+  @override
+  String incomingReplyToMessageLabel({required String replierName, required String authorName}) =>
       '$replierNameが$authorNameのメッセージに返信しました';
 
   @override
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
index 71f57465aa..d3b432b5db 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
@@ -947,10 +947,16 @@ class _AccessibilityTranslationsKo extends AccessibilityTranslations {
   String attachmentPositionLabel({required int index, required int total}) => '$total개 중 $index번째';
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) => '$replierName님이 내 메시지에 답장했습니다';
+  String outgoingReplyToOwnMessageLabel() => '내 메시지에 답장했습니다';
 
   @override
-  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+  String outgoingReplyToMessageLabel({required String authorName}) => '$authorName님의 메시지에 답장했습니다';
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) => '$replierName님이 내 메시지에 답장했습니다';
+
+  @override
+  String incomingReplyToMessageLabel({required String replierName, required String authorName}) =>
       '$replierName님이 $authorName님의 메시지에 답장했습니다';
 
   @override
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
index 73061df2c3..4f99e01d5d 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
@@ -950,10 +950,16 @@ class _AccessibilityTranslationsNo extends AccessibilityTranslations {
   String attachmentPositionLabel({required int index, required int total}) => '$index av $total';
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) => '$replierName svarte på meldingen din';
+  String outgoingReplyToOwnMessageLabel() => 'Du svarte på din egen melding';
 
   @override
-  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+  String outgoingReplyToMessageLabel({required String authorName}) => 'Du svarte på meldingen fra $authorName';
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) => '$replierName svarte på meldingen din';
+
+  @override
+  String incomingReplyToMessageLabel({required String replierName, required String authorName}) =>
       '$replierName svarte på meldingen fra $authorName';
 
   @override
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
index 060491bf36..305253b6d1 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
@@ -968,10 +968,16 @@ class _AccessibilityTranslationsPt extends AccessibilityTranslations {
   String attachmentPositionLabel({required int index, required int total}) => '$index de $total';
 
   @override
-  String repliedToOwnMessageLabel({required String replierName}) => '$replierName respondeu à sua mensagem';
+  String outgoingReplyToOwnMessageLabel() => 'Você respondeu à sua própria mensagem';
 
   @override
-  String repliedToMessageLabel({required String replierName, required String authorName}) =>
+  String outgoingReplyToMessageLabel({required String authorName}) => 'Você respondeu à mensagem de $authorName';
+
+  @override
+  String incomingReplyToOwnMessageLabel({required String replierName}) => '$replierName respondeu à sua mensagem';
+
+  @override
+  String incomingReplyToMessageLabel({required String replierName, required String authorName}) =>
       '$replierName respondeu à mensagem de $authorName';
 
   @override
diff --git a/packages/stream_chat_localizations/test/translations_test.dart b/packages/stream_chat_localizations/test/translations_test.dart
index 6abd42d5ce..15c7b3eb90 100644
--- a/packages/stream_chat_localizations/test/translations_test.dart
+++ b/packages/stream_chat_localizations/test/translations_test.dart
@@ -503,9 +503,11 @@ void main() {
       expect(a11y.incomingMessagePreviewLabel(senderName: 'Alice'), isNotNull);
       expect(a11y.messageFailedStatusLabel, isNotNull);
       expect(a11y.attachmentPositionLabel(index: 2, total: 5), isNotNull);
-      expect(a11y.repliedToOwnMessageLabel(replierName: 'Alice'), isNotNull);
+      expect(a11y.outgoingReplyToOwnMessageLabel(), isNotNull);
+      expect(a11y.outgoingReplyToMessageLabel(authorName: 'Bob'), isNotNull);
+      expect(a11y.incomingReplyToOwnMessageLabel(replierName: 'Alice'), isNotNull);
       expect(
-        a11y.repliedToMessageLabel(replierName: 'Alice', authorName: 'Bob'),
+        a11y.incomingReplyToMessageLabel(replierName: 'Alice', authorName: 'Bob'),
         isNotNull,
       );
       expect(a11y.outgoingMessageLabel(body: 'Hello'), isNotNull);

From a12dfa9a2eb045a04ca3114211aff42a7b4dee1c Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Thu, 27 Aug 2026 15:07:08 +0200
Subject: [PATCH 21/22] docs(ui): file the new accessibility API under Added

StreamMessageItem.semanticsLabel and StreamQuotedMessage.replyMessage are new
public parameters, announced in a trailing clause of a bullet under Fixed.
Someone scanning the release for new API would not find them there. Give each
its own entry under Added, per the changelog policy in STYLE_GUIDE.md, and
leave the Fixed bullet to describe the behaviour change it is about.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 packages/stream_chat_flutter/CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index d32ef8d21c..a9e2ccf4ff 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -3,6 +3,8 @@
 ✅ Added
 
 - Added `onReactionLongPress` to `StreamMessageItem` and `StreamMessageListView`, reporting the long-pressed message's `BuildContext` and a `ReactionLongPressDetails` with the `message` and `reaction` (the reaction is `null` for a clustered or overflow chip that maps to no single reaction).
+- Added `StreamMessageItem.semanticsLabel`, which replaces the announcement composed for a message row. Pass an empty string to leave the row unlabeled, in which case the bubble and footer announce their own parts.
+- Added `StreamQuotedMessage.replyMessage`, the message doing the quoting, which lets a quoted preview announce who replied to whom.
 - Added `StreamMessageRowLabelScope`, which marks a subtree whose metadata is already spoken by a composed row label. `StreamMessageFooter` and the message bubble stay out of the semantics tree inside one and announce themselves outside one.
 
 ⚠️ Changed
@@ -17,7 +19,7 @@
 
 🐞 Fixed
 
-- Improved the screen-reader experience in the message list. Each message is announced as a single phrase naming the sender and the direction ("You said, …" / "<name> said, …") together with the body, the time, the edited marker and the delivery status — including upload progress and a failure to send — while the attachments, reaction chips, quoted message and replies row stay reachable one level deeper. The body is announced as the text the bubble renders, so markdown link and emphasis syntax is no longer read aloud. Quoted messages say who replied to whom, attachment tiles announce their type and position in a gallery, date dividers announce the date they show — as a header — instead of a time they never showed, and a deleted message names who deleted it and keeps its timestamp and delivery status. `StreamMessageItem.semanticsLabel` and `StreamQuotedMessage.replyMessage` are new and let you adjust the composed announcements; a custom `messageBuilder` replaces the default layout and is responsible for its own label.
+- Improved the screen-reader experience in the message list. Each message is announced as a single phrase naming the sender and the direction ("You said, …" / "<name> said, …") together with the body, the time, the edited marker and the delivery status — including upload progress and a failure to send — while the attachments, reaction chips, quoted message and replies row stay reachable one level deeper. The body is announced as the text the bubble renders, so markdown link and emphasis syntax is no longer read aloud. Quoted messages say who replied to whom, attachment tiles announce their type and position in a gallery, date dividers announce the date they show — as a header — instead of a time they never showed, and a deleted message names who deleted it and keeps its timestamp and delivery status. A custom `messageBuilder` replaces the default layout and is responsible for its own label.
 - Fixed a crash on web when the message list rebuilt while messages were selectable, for example after opening the attachment picker.
 - Fixed the browser's native context menu reappearing over the message context menu on web after scrolling messages out of view or deleting one.
 - Fixed the SDK re-enabling the browser's native context menu on web in apps that had disabled it themselves.

From 3ac850fadff2073cb7b0c0d6250026328b928bd6 Mon Sep 17 00:00:00 2001
From: Rene Floor <rene.floor@getstream.io>
Date: Fri, 28 Aug 2026 09:02:25 +0200
Subject: [PATCH 22/22] improvements on link preview attachment

---
 packages/stream_chat_flutter/CHANGELOG.md                     | 1 +
 .../lib/src/indicators/sending_indicator.dart                 | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index a9e2ccf4ff..686c162742 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -23,6 +23,7 @@
 - Fixed a crash on web when the message list rebuilt while messages were selectable, for example after opening the attachment picker.
 - Fixed the browser's native context menu reappearing over the message context menu on web after scrolling messages out of view or deleting one.
 - Fixed the SDK re-enabling the browser's native context menu on web in apps that had disabled it themselves.
+- Fixed the attachment upload progress on an outgoing message counting its link preview, which inflated the total against an attachment the sender never picked.
 
 ## 10.3.0
 
diff --git a/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart b/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart
index fbe1176c08..7dfdf5ee00 100644
--- a/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart
+++ b/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart
@@ -109,8 +109,8 @@ extension StreamMessageStatusLabels on Translations {
 
     // A url preview is generated rather than uploaded, so counting it would
     // report progress against an attachment the sender never picked.
-    final attachments = message.attachments;
-    if (!attachments.any((it) => it.type != AttachmentType.urlPreview)) return null;
+    final attachments = message.attachments.where((it) => it.type != AttachmentType.urlPreview).toList();
+    if (attachments.isEmpty) return null;
 
     final uploaded = attachments.where((it) => it.uploadState.isSuccess).length;
     if (uploaded >= attachments.length) return null;
