diff --git a/Signal/src/ViewControllers/MessagesViewController.m b/Signal/src/ViewControllers/MessagesViewController.m
index 992d8c057..0795c8835 100644
--- a/Signal/src/ViewControllers/MessagesViewController.m
+++ b/Signal/src/ViewControllers/MessagesViewController.m
@@ -2702,10 +2702,8 @@ typedef enum : NSUInteger {
         [groupThread saveWithTransaction:transaction];
         message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
                                                       inThread:groupThread
-                                                   messageBody:@""
-                                                 attachmentIds:[NSMutableArray new]];
-        message.groupMetaMessage = TSGroupMessageUpdate;
-        [message updateWithCustomMessage:updateGroupInfo];
+                                              groupMetaMessage:TSGroupMessageUpdate];
+        [message updateWithCustomMessage:updateGroupInfo transaction:transaction];
     }];
 
     if (newGroupModel.groupImage) {
diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m
index 6d97d1e58..0c6a60a95 100644
--- a/Signal/src/ViewControllers/NewGroupViewController.m
+++ b/Signal/src/ViewControllers/NewGroupViewController.m
@@ -309,11 +309,10 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
                          TSOutgoingMessage *message =
                              [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
                                                                  inThread:self.thread
-                                                              messageBody:@""
-                                                            attachmentIds:[NSMutableArray new]];
+                                                         groupMetaMessage:TSGroupMessageNew];
 
-                         message.groupMetaMessage = TSGroupMessageNew;
-                         message.customMessage = NSLocalizedString(@"GROUP_CREATED", nil);
+                         // This will save the message.
+                         [message updateWithCustomMessage:NSLocalizedString(@"GROUP_CREATED", nil)];
                          if (model.groupImage) {
                              [self.messageSender sendAttachmentData:UIImagePNGRepresentation(model.groupImage)
                                                         contentType:OWSMimeTypeImagePng
diff --git a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m
index 5497a2e85..3451c3a2a 100644
--- a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m
+++ b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m
@@ -398,8 +398,7 @@ static NSString *const OWSConversationSettingsTableViewControllerSegueShowGroupM
     TSGroupThread *gThread = (TSGroupThread *)self.thread;
     TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
                                                                      inThread:gThread
-                                                                  messageBody:@""];
-    message.groupMetaMessage = TSGroupMessageQuit;
+                                                             groupMetaMessage:TSGroupMessageQuit];
     [self.messageSender sendMessage:message
         success:^{
             DDLogInfo(@"%@ Successfully left group.", self.tag);
diff --git a/Signal/src/ViewControllers/SignalsViewController.m b/Signal/src/ViewControllers/SignalsViewController.m
index ec42d1a72..5535d3692 100644
--- a/Signal/src/ViewControllers/SignalsViewController.m
+++ b/Signal/src/ViewControllers/SignalsViewController.m
@@ -460,9 +460,7 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS
 
             TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
                                                                              inThread:thread
-                                                                          messageBody:@""
-                                                                        attachmentIds:[NSMutableArray new]];
-            message.groupMetaMessage = TSGroupMessageQuit;
+                                                                     groupMetaMessage:TSGroupMessageQuit];
             [self.messageSender sendMessage:message
                                     success:^{
                                         [self dismissViewControllerAnimated:YES