diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index e5c817b16..79448803d 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -1504,22 +1504,22 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
 
     if (self.homeViewMode == HomeViewMode_Inbox) {
         if ([Environment.preferences getHasSentAMessage]) {
-            firstLine = NSLocalizedString(@"EMPTY_INBOX_FIRST_TITLE", @"");
-            secondLine = NSLocalizedString(@"EMPTY_INBOX_FIRST_TEXT", @"");
+            firstLine = NSLocalizedString(
+                @"EMPTY_INBOX_TITLE", @"Header text an existing user sees when viewing an empty inbox");
+            secondLine = NSLocalizedString(
+                @"EMPTY_INBOX_TEXT", @"Body text an existing user sees when viewing an empty inbox");
         } else {
-            //  FIXME: Misleading localizable string key name.
-            firstLine = NSLocalizedString(@"EMPTY_ARCHIVE_FIRST_TITLE", @"First (bolded) part of the label that shows up when there are neither active nor archived conversations");
-            secondLine = NSLocalizedString(@"EMPTY_ARCHIVE_FIRST_TEXT", @"Second part of the label that shows up when there are neither active nor archived conversations");
+            firstLine = NSLocalizedString(
+                @"EMPTY_INBOX_NEW_USER_TITLE", @"Header text a new user sees when viewing an empty inbox");
+            secondLine = NSLocalizedString(
+                @"EMPTY_INBOX_NEW_USER_TEXT", @"Body text a new user sees when viewing an empty inbox");
         }
     } else {
-        if ([Environment.preferences getHasArchivedAMessage]) {
-            //  FIXME: Shows up after the archival tab is cleared up completely by the user, the localizable string key is misleading.
-            firstLine = NSLocalizedString(@"EMPTY_INBOX_TITLE", @"");
-            secondLine = NSLocalizedString(@"EMPTY_INBOX_TEXT", @"");
-        } else {
-            firstLine = NSLocalizedString(@"EMPTY_ARCHIVE_TITLE", @"");
-            secondLine = NSLocalizedString(@"EMPTY_ARCHIVE_TEXT", @"");
-        }
+        OWSAssert(self.homeViewMode == HomeViewMode_Archive);
+        firstLine = NSLocalizedString(
+            @"EMPTY_ARCHIVE_TITLE", @"Header text an existing user sees when viewing an empty archive");
+        secondLine = NSLocalizedString(
+            @"EMPTY_ARCHIVE_TEXT", @"Body text an existing user sees when viewing an empty archive");
     }
     NSMutableAttributedString *fullLabelString =
         [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@\n%@", firstLine, secondLine]];
diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
index 67b798a6b..a54ebc498 100644
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@@ -747,16 +747,10 @@
 /* subject of email sent to contacts when inviting to install Signal */
 "EMAIL_INVITE_SUBJECT" = "Let's switch to Signal";
 
-/* Second part of the label that shows up when there are neither active nor archived conversations */
-"EMPTY_ARCHIVE_FIRST_TEXT" = "Tap on the compose button.";
-
-/* First (bolded) part of the label that shows up when there are neither active nor archived conversations */
-"EMPTY_ARCHIVE_FIRST_TITLE" = "Start your first Signal conversation!";
-
-/* No comment provided by engineer. */
+/* Body text an existing user sees when viewing an empty archive */
 "EMPTY_ARCHIVE_TEXT" = "You can archive inactive conversations for later from your Inbox.";
 
-/* No comment provided by engineer. */
+/* Header text an existing user sees when viewing an empty archive */
 "EMPTY_ARCHIVE_TITLE" = "Clean Up Your Conversations.";
 
 /* Full width label displayed when attempting to compose message */
@@ -765,16 +759,16 @@
 /* Full width label displayed when attempting to compose message */
 "EMPTY_CONTACTS_LABEL_LINE2" = "Why don't you invite someone?";
 
-/* No comment provided by engineer. */
-"EMPTY_INBOX_FIRST_TEXT" = "Tip: add a conversation as a reminder!";
+/* Body text a new user sees when viewing an empty inbox */
+"EMPTY_INBOX_NEW_USER_TEXT" = "Tap on the compose button";
 
-/* No comment provided by engineer. */
-"EMPTY_INBOX_FIRST_TITLE" = "Done. Done. Done.";
+/* Header text a new user sees when viewing an empty inbox */
+"EMPTY_INBOX_NEW_USER_TITLE" = "Start your first Signal conversation!";
 
-/* No comment provided by engineer. */
+/* Body text an existing user sees when viewing an empty inbox */
 "EMPTY_INBOX_TEXT" = "None. Zero. Zilch. Nada.";
 
-/* No comment provided by engineer. */
+/* Header text an existing user sees when viewing an empty inbox */
 "EMPTY_INBOX_TITLE" = "Squeaky Freaking Clean.";
 
 /* Indicates that user should confirm their 'two factor auth pin'. */