diff --git a/Podfile b/Podfile
index ffd1c3806..6c5716040 100644
--- a/Podfile
+++ b/Podfile
@@ -6,7 +6,7 @@ target 'Signal' do
     pod 'AxolotlKit',                 git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
     #pod 'AxolotlKit',                 path: '../SignalProtocolKit'
     pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
-    #pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git', :branch => 'charlesmchen/rateLimitingErrorMessage'
+    #pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git', :branch => 'charlesmchen/markUnsentMessages'
     #pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'OpenSSL'
     pod 'PastelogKit',                '~> 1.3'
diff --git a/Podfile.lock b/Podfile.lock
index 27b757ebc..f46d2cf20 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -140,7 +140,7 @@ CHECKOUT OPTIONS:
     :commit: 945c04f9e70f7119d2ada4edb938849f3b7febab
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   SignalServiceKit:
-    :commit: 12027152f4bffd650badad73203bff788684d76d
+    :commit: 7c55d559d3c9ef7e66a4ebd1daaf7620498c3e3a
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 41b57bb2fc292a814f758441a05243eb38457027
@@ -172,6 +172,6 @@ SPEC CHECKSUMS:
   YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
   ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
 
-PODFILE CHECKSUM: 23ca4df281ad1e794af6967db2047f43df88e96a
+PODFILE CHECKSUM: 1dec14c6ae3ecc013143fca915e5e7a3bb83bdc0
 
 COCOAPODS: 1.1.1
diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 97933aaf0..cffeedd7a 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -24,6 +24,7 @@
 #import <PastelogKit/Pastelog.h>
 #import <PromiseKit/AnyPromise.h>
 #import <SignalServiceKit/OWSDisappearingMessagesJob.h>
+#import <SignalServiceKit/OWSFailedMessagesJob.h>
 #import <SignalServiceKit/OWSIncomingMessageReadObserver.h>
 #import <SignalServiceKit/OWSMessageSender.h>
 #import <SignalServiceKit/TSAccountManager.h>
@@ -168,6 +169,11 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
 
         // Clean up any messages that expired since last launch.
         [[[OWSDisappearingMessagesJob alloc] initWithStorageManager:[TSStorageManager sharedManager]] run];
+
+        // Mark all "attempting out" messages as "unsent", i.e. any messages that were not successfully
+        // sent before the app exited should be marked as failures.
+        [[[OWSFailedMessagesJob alloc] initWithStorageManager:[TSStorageManager sharedManager]] run];
+
         [AppStoreRating setupRatingLibrary];
     }];