diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 8b4d46fa8..33bb4d6cd 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -169,24 +169,16 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
     UIViewController *viewController =
         [[UIStoryboard storyboardWithName:@"Launch Screen" bundle:nil] instantiateInitialViewController];
 
-    BOOL shouldShowUpgradeLabel = NO;
-    NSString *lastAppVersion = AppVersion.instance.lastAppVersion;
+    NSString *lastLaunchedAppVersion = AppVersion.instance.lastAppVersion;
     NSString *lastCompletedLaunchAppVersion = AppVersion.instance.lastCompletedLaunchAppVersion;
-    BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] &&
-        [VersionMigrations isVersion:lastAppVersion atLeast:@"2.0.0" andLessThan:@"2.13.0"]);
-    BOOL hasCompletedUpgrade = (lastCompletedLaunchAppVersion &&
-        [VersionMigrations isVersion:lastCompletedLaunchAppVersion atLeast:@"2.13.0"]);
-
     // We added a number of database views in v2.13.0.
-    if (mayNeedUpgrade && !hasCompletedUpgrade) {
-        shouldShowUpgradeLabel = YES;
-    }
-    DDLogInfo(@"%@ shouldShowUpgradeLabel: %d, %d -> %d",
-        self.tag,
-        mayNeedUpgrade,
-        hasCompletedUpgrade,
-        shouldShowUpgradeLabel);
-    if (shouldShowUpgradeLabel) {
+    NSString *kLastVersionWithDatabaseViewChange = @"2.13.0";
+    BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] && lastLaunchedAppVersion
+        && (!lastCompletedLaunchAppVersion ||
+               [VersionMigrations isVersion:lastCompletedLaunchAppVersion
+                                   lessThan:kLastVersionWithDatabaseViewChange]));
+    DDLogInfo(@"%@ mayNeedUpgrade: %d", self.tag, mayNeedUpgrade);
+    if (mayNeedUpgrade) {
         UIView *rootView = viewController.view;
         UIImageView *iconView = nil;
         for (UIView *subview in viewController.view.subviews) {
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
index 1d72a34b4..f9daf3613 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
@@ -59,6 +59,10 @@ NS_ASSUME_NONNULL_BEGIN
                                        actionBlock:^{
                                            [DebugUIMessages sendTextMessages:1000 thread:thread];
                                        }],
+                       [OWSTableItem itemWithTitle:@"Send 3,000 messages (1/sec.)"
+                                       actionBlock:^{
+                                           [DebugUIMessages sendTextMessages:3000 thread:thread];
+                                       }],
                        [OWSTableItem itemWithTitle:@"Send 10 tiny attachments"
                                        actionBlock:^{
                                            [DebugUIMessages sendTinyAttachments:10 thread:thread];
@@ -71,6 +75,10 @@ NS_ASSUME_NONNULL_BEGIN
                                        actionBlock:^{
                                            [DebugUIMessages sendTinyAttachments:1000 thread:thread];
                                        }],
+                       [OWSTableItem itemWithTitle:@"Send 3,000 tiny attachments"
+                                       actionBlock:^{
+                                           [DebugUIMessages sendTinyAttachments:3000 thread:thread];
+                                       }],
                        [OWSTableItem itemWithTitle:@"Create 10 fake messages"
                                        actionBlock:^{
                                            [DebugUIMessages sendFakeMessages:10 thread:thread];
diff --git a/Signal/src/environment/VersionMigrations.h b/Signal/src/environment/VersionMigrations.h
index bc0064fa3..9b9c00f93 100644
--- a/Signal/src/environment/VersionMigrations.h
+++ b/Signal/src/environment/VersionMigrations.h
@@ -18,4 +18,6 @@
 
 + (BOOL)isVersion:(NSString *)thisVersionString atLeast:(NSString *)thatVersionString;
 
++ (BOOL)isVersion:(NSString *)thisVersionString lessThan:(NSString *)thatVersionString;
+
 @end