diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 1b6346221..bb62cab23 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -1190,6 +1190,19 @@ typedef enum : NSUInteger {
 
     // Clear the "on open" state after the view has been presented.
     self.actionOnOpen = ConversationViewActionNone;
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSURL *_Nullable url = [[NSBundle mainBundle] URLForResource:@"qr@2x" withExtension:@"png"];
+        OWSAssertDebug(url);
+
+        DataSource *_Nullable dataSource = [DataSourcePath dataSourceWithURL:url shouldDeleteOnDeallocation:NO];
+        OWSAssertDebug(dataSource);
+        SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource
+                                                                          dataUTI:(NSString *)kUTTypePNG
+                                                                     imageQuality:TSImageQualityOriginal];
+
+        [self showApprovalDialogForAttachments:@[ attachment ]];
+    });
 }
 
 // `viewWillDisappear` is called whenever the view *starts* to disappear,
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index 586ef500e..8438abf18 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -481,6 +481,12 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
     [self.searchResultsController viewDidAppear:animated];
 
     self.hasEverAppeared = YES;
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSIndexPath *indexPath = [NSIndexPath indexPathForRow:0 inSection:HomeViewControllerSectionConversations];
+        TSThread *thread = [self threadForIndexPath:indexPath];
+        [self presentThread:thread action:ConversationViewActionNone animated:YES];
+    });
 }
 
 - (void)viewDidDisappear:(BOOL)animated
diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
index 67a0d7270..0418b396f 100644
--- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
+++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
@@ -893,6 +893,7 @@ public class AttachmentPrepViewController: OWSViewController, PlayerProgressBarD
         if let imageEditorModel = attachmentItem.imageEditorModel,
             let imageMediaView = self.mediaMessageView.contentView {
             let imageEditorView = ImageEditorView(model: imageEditorModel)
+            imageEditorView.addRedBorder()
             imageMediaView.addSubview(imageEditorView)
             imageEditorView.autoPinEdgesToSuperviewEdges()
             self.imageEditorView = imageEditorView