diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index 57598dadff..c510b364fb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -268,8 +268,7 @@ class VisibleMessageView : FrameLayout {
     // Method to display or hide the status of a message.
     // Note: Although most commonly used to display the delivery status of a message, we also use the
     // message status area to display the disappearing messages state - so in this latter case we'll
-    // be displaying the "Sent" and the animating clock icon for outgoing messages or "Read" and the
-    // animated clock icon for incoming messages.
+    // be displaying either "Sent" or "Read" and the animating clock icon.
     private fun showStatusMessage(message: MessageRecord) {
         // We'll start by hiding everything and then only make visible what we need
         binding.messageStatusTextView.isVisible  = false
@@ -392,11 +391,21 @@ class VisibleMessageView : FrameLayout {
                 R.string.messageStatusFailedToSync
             )
         message.isPending ->
-            MessageStatusInfo(
-                R.drawable.ic_delivery_status_sending,
-                context.getColorFromAttr(R.attr.message_status_color),
-                R.string.sending
-            )
+            // Non-mms messages display 'Sending'..
+            if (!message.isMms) {
+                MessageStatusInfo(
+                    R.drawable.ic_delivery_status_sending,
+                    context.getColorFromAttr(R.attr.message_status_color),
+                    R.string.sending
+                )
+            } else {
+                // ..and Mms messages display 'Uploading'.
+                MessageStatusInfo(
+                    R.drawable.ic_delivery_status_sending,
+                    context.getColorFromAttr(R.attr.message_status_color),
+                    R.string.messageStatusUploading
+                )
+            }
         message.isSyncing || message.isResyncing ->
             MessageStatusInfo(
                 R.drawable.ic_delivery_status_sending,
diff --git a/libsession/src/main/res/values/strings.xml b/libsession/src/main/res/values/strings.xml
index d573f97103..c348eed20a 100644
--- a/libsession/src/main/res/values/strings.xml
+++ b/libsession/src/main/res/values/strings.xml
@@ -512,6 +512,7 @@
     <string name="messageStatusFailedToSend">Failed to send</string>
     <string name="messageStatusFailedToSync">Failed to sync</string>
     <string name="messageStatusSyncing">Syncing</string>
+    <string name="messageStatusUploading">Uploading</string>
     <string name="messageUnread">Unread messages</string>
     <string name="messageVoice">Voice Message</string>
     <string name="messageVoiceErrorShort">Hold to record a voice message</string>