Respond to CR.

// FREEBIE

src/Messages/OWSMessageSender.m

@@ -148,6 +148,8 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4;
             return;
         }
 
+        [strongSelf.messageSender saveMessage:strongSelf.message withError:error];
+
         DDLogDebug(@"%@ failed with error: %@", strongSelf.tag, error);
         aFailureHandler(error);
         [strongSelf markAsComplete];
@@ -237,8 +239,6 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4;
         } else {
             DDLogWarn(@"%@ Too many failures. Giving up sending.", self.tag);
 
-            [self.messageSender saveMessage:self.message withError:error];
-
             self.failureHandler(error);
         }
     };