diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt
index 1c6442824d..61d17e44f0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt
@@ -102,14 +102,13 @@ class ConversationActionBarView @JvmOverloads constructor(
         if (config?.isEnabled == true) {
             // Get the type of disappearing message and the abbreviated duration..
             val dmTypeString = when (config.expiryMode) {
-                is AfterRead -> context.getString(R.string.read)
-                else -> context.getString(R.string.send)
+                is AfterRead -> R.string.disappearingMessagesDisappearAfterReadState
+                else -> R.string.disappearingMessagesDisappearAfterSendState
             }
             val durationAbbreviated = ExpirationUtil.getExpirationAbbreviatedDisplayValue(config.expiryMode.expirySeconds)
 
             // ..then substitute into the string..
-            val subtitleTxt = context.getSubbedString(R.string.disappearingMessagesDisappear,
-                DISAPPEARING_MESSAGES_TYPE_KEY to dmTypeString,
+            val subtitleTxt = context.getSubbedString(dmTypeString,
                 TIME_KEY to durationAbbreviated
                 )
 
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 0fce0036d5..1734d75b08 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
@@ -61,6 +61,8 @@ import org.thoughtcrime.securesms.groups.OpenGroupManager
 import org.thoughtcrime.securesms.home.UserDetailsBottomSheet
 import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestManager
+import org.session.libsignal.utilities.Log
+import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.disableClipping
 import org.thoughtcrime.securesms.util.toDp
@@ -391,9 +393,9 @@ class VisibleMessageView : FrameLayout {
                 context.getColor(R.color.accent_orange),
                 R.string.messageStatusFailedToSync
             )
-        message.isPending ->
-            // Non-mms messages display 'Sending'..
-            if (!message.isMms) {
+        message.isPending -> {
+            // Non-mms messages (or quote messages, which happen to be mms for some reason) display 'Sending'..
+            if (!message.isMms || (message as? MmsMessageRecord)?.quote != null) {
                 MessageStatusInfo(
                     R.drawable.ic_delivery_status_sending,
                     context.getColorFromAttr(R.attr.message_status_color),
@@ -407,6 +409,7 @@ class VisibleMessageView : FrameLayout {
                     R.string.uploading
                 )
             }
+        }
         message.isSyncing || message.isResyncing ->
             MessageStatusInfo(
                 R.drawable.ic_delivery_status_sending,
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 153ac195c9..9637bc3a70 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -149,6 +149,7 @@
     </array>
 
     <string-array name="notify_types">
+        <item>@string/notificationsAllMessages</item>
         <item>@string/notificationsMentionsOnly</item>
     </string-array>