diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m
index a125c4dc0..5d491663c 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m
@@ -164,12 +164,15 @@ NS_ASSUME_NONNULL_BEGIN
 
     [self configureFonts];
 
+    NSString *timestampLabelText;
     if ([self isFailedOutgoingMessage:viewItem]) {
-        self.timestampLabel.text
+        timestampLabelText
             = NSLocalizedString(@"MESSAGE_STATUS_SEND_FAILED", @"Label indicating that a message failed to send.");
     } else {
-        self.timestampLabel.text = [DateUtil formatMessageTimestamp:viewItem.interaction.timestamp];
+        timestampLabelText = [DateUtil formatMessageTimestamp:viewItem.interaction.timestamp];
     }
+
+    self.timestampLabel.text = timestampLabelText.localizedUppercaseString;
 }
 
 - (CGSize)measureWithConversationViewItem:(ConversationViewItem *)viewItem
diff --git a/Signal/src/util/DateUtil.m b/Signal/src/util/DateUtil.m
index bda7dcaec..38e1bb47e 100644
--- a/Signal/src/util/DateUtil.m
+++ b/Signal/src/util/DateUtil.m
@@ -302,7 +302,7 @@ static NSString *const DATE_FORMAT_WEEKDAY = @"EEEE";
                                                 @"hours in the past. Embeds {{The number of hours}}."),
                            hoursString];
     }
-    return result.uppercaseString;
+    return result;
 }
 
 + (BOOL)isTimestampFromLastHour:(uint64_t)timestamp