diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageViewOnceView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageViewOnceView.m
index 7f678dfc45..116235282a 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageViewOnceView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageViewOnceView.m
@@ -472,8 +472,6 @@ typedef NS_ENUM(NSUInteger, ViewOnceMessageType) {
             self.label.text = CommonStrings.retryButton;
             break;
         case ViewOnceMessageState_OutgoingSending:
-            self.label.text = NSLocalizedString(@"MESSAGE_STATUS_SENDING", @"message status while message is sending.");
-            break;
         case ViewOnceMessageState_OutgoingSentExpired:
             self.label.text = NSLocalizedString(
                 @"PER_MESSAGE_EXPIRATION_OUTGOING_MESSAGE", @"Label for outgoing view-once messages.");
diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
index ebb03794d2..a47c171151 100644
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@@ -1888,22 +1888,22 @@
 "PER_MESSAGE_EXPIRATION_INVALID_CONTENT" = "Error handling incoming message";
 
 /* inbox cell and notification text for an already viewed view-once media message. */
-"PER_MESSAGE_EXPIRATION_NOT_VIEWABLE" = "Media Message";
+"PER_MESSAGE_EXPIRATION_NOT_VIEWABLE" = "View-once media";
 
 /* Label for outgoing view-once messages. */
 "PER_MESSAGE_EXPIRATION_OUTGOING_MESSAGE" = "Media";
 
 /* inbox cell and notification text for a view-once photo. */
-"PER_MESSAGE_EXPIRATION_PHOTO_PREVIEW" = "Disappearing Photo";
+"PER_MESSAGE_EXPIRATION_PHOTO_PREVIEW" = "View-once photo";
 
 /* inbox cell and notification text for a view-once video. */
-"PER_MESSAGE_EXPIRATION_VIDEO_PREVIEW" = "Disappearing Video";
+"PER_MESSAGE_EXPIRATION_VIDEO_PREVIEW" = "View-once video";
 
 /* Label for view-once messages indicating that user can tap to view the message's contents. */
-"PER_MESSAGE_EXPIRATION_VIEW_PHOTO" = "Photo";
+"PER_MESSAGE_EXPIRATION_VIEW_PHOTO" = "View Photo";
 
 /* Label for view-once messages indicating that user can tap to view the message's contents. */
-"PER_MESSAGE_EXPIRATION_VIEW_VIDEO" = "Video";
+"PER_MESSAGE_EXPIRATION_VIEW_VIDEO" = "View Video";
 
 /* Label for view-once messages indicating that the local user has viewed the message's contents. */
 "PER_MESSAGE_EXPIRATION_VIEWED" = "Viewed";
diff --git a/SignalMessaging/ViewModels/OWSQuotedReplyModel.m b/SignalMessaging/ViewModels/OWSQuotedReplyModel.m
index 9d06433ea8..e52351470b 100644
--- a/SignalMessaging/ViewModels/OWSQuotedReplyModel.m
+++ b/SignalMessaging/ViewModels/OWSQuotedReplyModel.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSQuotedReplyModel.h"
@@ -148,7 +148,7 @@ NS_ASSUME_NONNULL_BEGIN
         // We construct a quote that does not include any of the
         // quoted message's renderable content.
         NSString *body
-            = NSLocalizedString(@"PER_MESSAGE_EXPIRATION_OUTGOING_MESSAGE", @"Label for outgoing view-once messages.");
+            = NSLocalizedString(@"PER_MESSAGE_EXPIRATION_NOT_VIEWABLE", @"inbox cell and notification text for an already viewed view-once media message.");
         return [[self alloc] initWithTimestamp:timestamp
                                  authorAddress:authorAddress
                                           body:body
diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage.m b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
index 4498a05b4d..cbcc9258ce 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
 //
 
 #import "TSMessage.h"
@@ -494,17 +494,14 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
                 return NSLocalizedString(@"PER_MESSAGE_EXPIRATION_NOT_VIEWABLE",
                     @"inbox cell and notification text for an already viewed view-once media message.");
             } else {
-                NSString *emoji = [TSAttachment emojiForMimeType:mediaAttachment.contentType];
-                NSString *messageDescription;
                 if (mediaAttachment.isVideo) {
-                    messageDescription = NSLocalizedString(@"PER_MESSAGE_EXPIRATION_VIDEO_PREVIEW",
+                    return NSLocalizedString(@"PER_MESSAGE_EXPIRATION_VIDEO_PREVIEW",
                         @"inbox cell and notification text for a view-once video.");
                 } else {
                     OWSAssertDebug(mediaAttachment.isImage);
-                    messageDescription = NSLocalizedString(@"PER_MESSAGE_EXPIRATION_PHOTO_PREVIEW",
+                    return NSLocalizedString(@"PER_MESSAGE_EXPIRATION_PHOTO_PREVIEW",
                         @"inbox cell and notification text for a view-once photo.");
                 }
-                return [[emoji stringByAppendingString:@" "] stringByAppendingString:messageDescription];
             }
         }
     }