diff --git a/packages/stream_chat/lib/src/client/retry_queue.dart b/packages/stream_chat/lib/src/client/retry_queue.dart
index e1b6df70..7c3157b2 100644
--- a/packages/stream_chat/lib/src/client/retry_queue.dart
+++ b/packages/stream_chat/lib/src/client/retry_queue.dart
@@ -118,6 +118,7 @@ class RetryQueue {
       } catch (e) {
         if (e is! StreamChatNetworkError || !e.isRetriable) {
           _messageQueue.removeMessage(message);
+          _sendFailedEvent(message);
           return true;
         }
         // retry logic
diff --git a/packages/stream_chat/lib/stream_chat.dart b/packages/stream_chat/lib/stream_chat.dart
index 571d78f5..367b27af 100644
--- a/packages/stream_chat/lib/stream_chat.dart
+++ b/packages/stream_chat/lib/stream_chat.dart
@@ -7,6 +7,7 @@ export 'package:dio/src/options.dart';
 export 'package:dio/src/options.dart' show ProgressCallback;
 export 'package:logging/logging.dart' show Logger, Level;
 export 'package:rate_limiter/rate_limiter.dart';
+export 'package:uuid/uuid.dart';
 
 export './src/core/api/attachment_file_uploader.dart'
     show AttachmentFileUploader;
diff --git a/packages/stream_chat_flutter/lib/src/message_input/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input/message_input.dart
index aa18fce5..56bedd57 100644
--- a/packages/stream_chat_flutter/lib/src/message_input/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input/message_input.dart
@@ -421,72 +421,69 @@ class MessageInputState extends State<MessageInput> {
   Widget build(BuildContext context) {
     Widget child = ValueListenableBuilder<Message>(
       valueListenable: messageInputController,
-      builder: (context, value, wid) {
-        print('VALUE ${value.text}');
-        return DecoratedBox(
-          decoration: BoxDecoration(
-            color: _messageInputTheme.inputBackgroundColor,
-          ),
-          child: SafeArea(
-            child: GestureDetector(
-              onPanUpdate: (details) {
-                if (details.delta.dy > 0) {
-                  _focusNode.unfocus();
-                  if (_openFilePickerSection) {
-                    setState(() {
-                      _openFilePickerSection = false;
-                    });
-                  }
+      builder: (context, value, wid) => DecoratedBox(
+        decoration: BoxDecoration(
+          color: _messageInputTheme.inputBackgroundColor,
+        ),
+        child: SafeArea(
+          child: GestureDetector(
+            onPanUpdate: (details) {
+              if (details.delta.dy > 0) {
+                _focusNode.unfocus();
+                if (_openFilePickerSection) {
+                  setState(() {
+                    _openFilePickerSection = false;
+                  });
                 }
-              },
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  if (_hasQuotedMessage)
-                    Padding(
-                      padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          Padding(
-                            padding: const EdgeInsets.all(8),
-                            child: StreamSvgIcon.reply(
-                              color: _streamChatTheme.colorTheme.disabled,
-                            ),
-                          ),
-                          Text(
-                            context.translations.replyToMessageLabel,
-                            style: const TextStyle(fontWeight: FontWeight.bold),
-                          ),
-                          IconButton(
-                            visualDensity: VisualDensity.compact,
-                            icon: StreamSvgIcon.closeSmall(),
-                            onPressed: widget.onQuotedMessageCleared,
-                          ),
-                        ],
-                      ),
-                    ),
+              }
+            },
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                if (_hasQuotedMessage)
                   Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 8),
-                    child: _buildTextField(context),
-                  ),
-                  if (messageInputController.value.parentId != null &&
-                      !widget.hideSendAsDm)
-                    Padding(
-                      padding: const EdgeInsets.only(
-                        right: 12,
-                        left: 12,
-                        bottom: 12,
-                      ),
-                      child: _buildDmCheckbox(),
+                    padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.all(8),
+                          child: StreamSvgIcon.reply(
+                            color: _streamChatTheme.colorTheme.disabled,
+                          ),
+                        ),
+                        Text(
+                          context.translations.replyToMessageLabel,
+                          style: const TextStyle(fontWeight: FontWeight.bold),
+                        ),
+                        IconButton(
+                          visualDensity: VisualDensity.compact,
+                          icon: StreamSvgIcon.closeSmall(),
+                          onPressed: widget.onQuotedMessageCleared,
+                        ),
+                      ],
                     ),
-                  _buildFilePickerSection(),
-                ],
-              ),
+                  ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 8),
+                  child: _buildTextField(context),
+                ),
+                if (messageInputController.value.parentId != null &&
+                    !widget.hideSendAsDm)
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      right: 12,
+                      left: 12,
+                      bottom: 12,
+                    ),
+                    child: _buildDmCheckbox(),
+                  ),
+                _buildFilePickerSection(),
+              ],
             ),
           ),
-        );
-      },
+        ),
+      ),
     );
     if (_isEditing) {
       child = Material(
diff --git a/packages/stream_chat_flutter_core/lib/src/message_input_controller.dart b/packages/stream_chat_flutter_core/lib/src/message_input_controller.dart
index 4d1565da..0c6a8719 100644
--- a/packages/stream_chat_flutter_core/lib/src/message_input_controller.dart
+++ b/packages/stream_chat_flutter_core/lib/src/message_input_controller.dart
@@ -88,7 +88,7 @@ class MessageInputController extends ValueNotifier<Message> {
   ///
   String get text => _textEditingController.text;
 
-  final Message _initialMessage;
+  Message _initialMessage;
 
   ///
   set message(Message message) {
@@ -206,13 +206,20 @@ class MessageInputController extends ValueNotifier<Message> {
   }
 
   /// Set the [value] to the initial [Message] value.
-  void reset() => value = _initialMessage;
+  void reset({bool resetId = true}) {
+    if (resetId) {
+      _initialMessage = _initialMessage.copyWith(
+        id: const Uuid().v4(),
+      );
+    }
+    value = _initialMessage;
+  }
 
   @override
   void dispose() {
-    super.dispose();
     removeListener(_textEditingSyncer);
     _textEditingController.dispose();
+    super.dispose();
   }
 }