diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
index 415252e9be..a3f578f5a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.mediasend.v2.review
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.view.ContextThemeWrapper
 import android.view.KeyEvent
@@ -17,7 +18,6 @@ import org.thoughtcrime.securesms.components.KeyboardEntryDialogFragment
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard
 import org.thoughtcrime.securesms.components.mention.MentionAnnotation
-import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher
 import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerFragment
 import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerViewModel
 import org.thoughtcrime.securesms.keyboard.KeyboardPage
@@ -66,11 +66,6 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     input = view.findViewById(R.id.add_a_message_input)
     input.setText(requireArguments().getCharSequence(ARG_INITIAL_TEXT))
-    input.addTextChangedListener(object : SimpleTextWatcher() {
-      override fun onTextChanged(text: String?) {
-        viewModel.setMessage(text)
-      }
-    })
 
     emojiDrawerToggle = view.findViewById(R.id.emoji_toggle)
     emojiDrawerStub = Stub(view.findViewById(R.id.emoji_drawer_stub))
@@ -114,6 +109,11 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
     ViewUtil.hideKeyboard(requireContext(), input)
   }
 
+  override fun onDismiss(dialog: DialogInterface) {
+    super.onDismiss(dialog)
+    viewModel.setMessage(input.text)
+  }
+
   override fun onKeyboardHidden() {
     if (!requestedEmojiDrawer) {
       super.onKeyboardHidden()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
index dd57f7bd85..63e017fbcd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
@@ -248,7 +248,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment) {
   }
 
   private fun presentAddMessageEntry(message: CharSequence?) {
-    addMessageEntry.text = message
+    addMessageEntry.setText(message, TextView.BufferType.SPANNABLE)
   }
 
   private fun presentImageQualityToggle(quality: SentMediaQuality) {
diff --git a/app/src/main/res/layout/v2_media_review_fragment.xml b/app/src/main/res/layout/v2_media_review_fragment.xml
index db20e15f08..1494e49f5b 100644
--- a/app/src/main/res/layout/v2_media_review_fragment.xml
+++ b/app/src/main/res/layout/v2_media_review_fragment.xml
@@ -151,7 +151,7 @@
             app:layout_constraintBottom_toTopOf="@id/button_barrier"
             tools:alpha="1" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiEditText
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
             android:id="@+id/add_a_message_entry"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"