diff --git a/src/Messages/Attachments/TSAttachmentStream.m b/src/Messages/Attachments/TSAttachmentStream.m
index 38670b800..86d7ba36a 100644
--- a/src/Messages/Attachments/TSAttachmentStream.m
+++ b/src/Messages/Attachments/TSAttachmentStream.m
@@ -183,20 +183,31 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (NSString *)attachmentsFolder
 {
-    NSString *documentsPath =
-        [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
-    NSString *attachmentFolder = [documentsPath stringByAppendingFormat:@"/Attachments"];
-
-    NSError *error = nil;
-    [[NSFileManager defaultManager] createDirectoryAtPath:attachmentFolder
-                              withIntermediateDirectories:YES
-                                               attributes:nil
-                                                    error:&error];
-    if (error) {
-        DDLogError(@"Failed to create attachments directory: %@", error);
-    }
+    static NSString *attachmentsFolder = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        NSString *documentsPath =
+            [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
+        attachmentsFolder = [documentsPath stringByAppendingFormat:@"/Attachments"];
+
+        BOOL isDirectory;
+        BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:attachmentsFolder isDirectory:&isDirectory];
+        if (exists) {
+            OWSAssert(isDirectory);
 
-    return attachmentFolder;
+            DDLogInfo(@"Attachments directory already exists");
+        } else {
+            NSError *error = nil;
+            [[NSFileManager defaultManager] createDirectoryAtPath:attachmentsFolder
+                                      withIntermediateDirectories:YES
+                                                       attributes:nil
+                                                            error:&error];
+            if (error) {
+                DDLogError(@"Failed to create attachments directory: %@", error);
+            }
+        }
+    });
+    return attachmentsFolder;
 }
 
 + (NSUInteger)numberOfItemsInAttachmentsFolder
diff --git a/src/Util/AppVersion.h b/src/Util/AppVersion.h
index 96d23c286..d5455f41a 100755
--- a/src/Util/AppVersion.h
+++ b/src/Util/AppVersion.h
@@ -1,6 +1,4 @@
 //
-//  AppVersion.h
-//
 //  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //
 
@@ -10,6 +8,14 @@
 @property (nonatomic, readonly) NSString *lastAppVersion;
 @property (nonatomic, readonly) NSString *currentAppVersion;
 
+// Unlike lastAppVersion, this property isn't updated until
+// appLaunchDidComplete is called.
+@property (nonatomic, readonly) NSString *lastCompletedLaunchAppVersion;
+
 + (instancetype)instance;
 
+- (void)appLaunchDidComplete;
+
+- (BOOL)isFirstLaunch;
+
 @end
diff --git a/src/Util/AppVersion.m b/src/Util/AppVersion.m
index 267c1c334..de7f6c6fb 100755
--- a/src/Util/AppVersion.m
+++ b/src/Util/AppVersion.m
@@ -1,16 +1,19 @@
 //
-//  AppVersion.m
-//
 //  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //
 
 #import "AppVersion.h"
 
+NSString *const kNSUserDefaults_FirstAppVersion = @"kNSUserDefaults_FirstAppVersion";
+NSString *const kNSUserDefaults_LastAppVersion = @"kNSUserDefaults_LastVersion";
+NSString *const kNSUserDefaults_LastCompletedLaunchAppVersion = @"kNSUserDefaults_LastCompletedLaunchAppVersion";
+
 @interface AppVersion ()
 
 @property (nonatomic) NSString *firstAppVersion;
 @property (nonatomic) NSString *lastAppVersion;
 @property (nonatomic) NSString *currentAppVersion;
+@property (nonatomic) NSString *lastCompletedLaunchAppVersion;
 
 @end
 
@@ -31,19 +34,15 @@
 - (void)configure {
     self.currentAppVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
     
-    NSString *kNSUserDefaults_FirstAppVersion = @"kNSUserDefaults_FirstAppVersion";
-    NSString *kNSUserDefaults_LastAppVersion = @"kNSUserDefaults_LastVersion";
-    
     // The version of the app when it was first launched.
     // nil if the app has never been launched before.
     self.firstAppVersion = [[NSUserDefaults standardUserDefaults] objectForKey:kNSUserDefaults_FirstAppVersion];
     // The version of the app the last time it was launched.
     // nil if the app has never been launched before.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-variable"
     self.lastAppVersion = [[NSUserDefaults standardUserDefaults] objectForKey:kNSUserDefaults_LastAppVersion];
-#pragma clang diagnostic pop
-    
+    self.lastCompletedLaunchAppVersion =
+        [[NSUserDefaults standardUserDefaults] objectForKey:kNSUserDefaults_LastCompletedLaunchAppVersion];
+
     // Ensure the value for the "first launched version".
     if (!self.firstAppVersion) {
         self.firstAppVersion = self.currentAppVersion;
@@ -59,6 +58,24 @@
     DDLogInfo(@"firstAppVersion: %@", self.firstAppVersion);
     DDLogInfo(@"lastAppVersion: %@", self.lastAppVersion);
     DDLogInfo(@"currentAppVersion: %@", self.currentAppVersion);
+    DDLogInfo(@"lastCompletedLaunchAppVersion: %@", self.lastCompletedLaunchAppVersion);
+}
+
+- (void)appLaunchDidComplete
+{
+    DDLogInfo(@"appLaunchDidComplete");
+
+    self.lastCompletedLaunchAppVersion = self.currentAppVersion;
+
+    // Update the value for the "most recently launch-completed version".
+    [[NSUserDefaults standardUserDefaults] setObject:self.currentAppVersion
+                                              forKey:kNSUserDefaults_LastCompletedLaunchAppVersion];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
+- (BOOL)isFirstLaunch
+{
+    return self.firstAppVersion != nil;
 }
 
 @end