diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
index 6898e90c45..c741bd2eb5 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSOutgoingSyncMessage.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSOutgoingSyncMessage.h>
 #import <SignalServiceKit/ProtoUtils.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m
index 49e7f51ece..13d22e7ff7 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDynamicOutgoingMessage.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSDynamicOutgoingMessage.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSDynamicOutgoingMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/SignalServiceKit/src/Messages/OWSMessageHandler.m b/SignalServiceKit/src/Messages/OWSMessageHandler.m
index d80bbec910..c279290944 100644
--- a/SignalServiceKit/src/Messages/OWSMessageHandler.m
+++ b/SignalServiceKit/src/Messages/OWSMessageHandler.m
@@ -93,7 +93,10 @@ NSString *envelopeAddress(SSKProtoEnvelope *envelope)
 
     // SKDM's are not mutually exclusive with other content types
     if (content.hasSenderKeyDistributionMessage) {
-        [message appendString:@" + SenderKeyDistributionMessage"];
+        if (message.length > 0) {
+            [message appendString:@" + "];
+        }
+        [message appendString:@"SenderKeyDistributionMessage"];
     }
 
     if (message.length > 0) {
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m
index f181a06987..b4a9ddce87 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m
+++ b/SignalServiceKit/src/Messages/OWSOutgoingCallMessage.m
@@ -2,8 +2,8 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSOutgoingCallMessage.h"
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSOutgoingCallMessage.h>
 #import <SignalServiceKit/ProtoUtils.h>
 #import <SignalServiceKit/SignalRecipient.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m
index cd66f384a7..d549a22c40 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m
+++ b/SignalServiceKit/src/Messages/OWSOutgoingNullMessage.m
@@ -2,9 +2,9 @@
 //  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSOutgoingNullMessage.h"
 #import <SignalCoreKit/Cryptography.h>
 #import <SignalCoreKit/NSDate+OWS.h>
-#import <SignalServiceKit/OWSOutgoingNullMessage.h>
 #import <SignalServiceKit/OWSVerificationStateSyncMessage.h>
 #import <SignalServiceKit/SignalServiceKit-Swift.h>
 #import <SignalServiceKit/TSContactThread.h>
diff --git a/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.m b/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.m
index 312e576e23..5b0b20ff52 100644
--- a/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.m
+++ b/SignalServiceKit/src/Messages/OWSOutgoingResendResponse.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2021 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSOutgoingResendResponse.h"
@@ -43,7 +43,8 @@
                                                          address:address
                                                      transaction:transaction];
     } else if (didPerformSessionReset) {
-        OWSLogInfo(@"Failed to find MSL record for resend request: %lli. Will reply with Null message", failedTimestamp);
+        OWSLogInfo(
+            @"Failed to find MSL record for resend request: %lli. Will reply with Null message", failedTimestamp);
     } else {
         OWSLogInfo(@"Failed to find MSL record for resend request: %lli. Declining to respond.", failedTimestamp);
         return nil;
@@ -97,7 +98,9 @@
     }
 }
 
-- (void)updateWithSentRecipient:(SignalServiceAddress *)recipientAddress wasSentByUD:(BOOL)wasSentByUD transaction:(SDSAnyWriteTransaction *)transaction
+- (void)updateWithSentRecipient:(SignalServiceAddress *)recipientAddress
+                    wasSentByUD:(BOOL)wasSentByUD
+                    transaction:(SDSAnyWriteTransaction *)transaction
 {
     [super updateWithSentRecipient:recipientAddress wasSentByUD:wasSentByUD transaction:transaction];
 
@@ -135,7 +138,8 @@
 
 - (void)resetSenderKeyDeliveryRecordIfNecessaryForThreadId:(NSString *)threadId
                                                    address:(SignalServiceAddress *)address
-                                               transaction:(SDSAnyWriteTransaction *)transaction {
+                                               transaction:(SDSAnyWriteTransaction *)transaction
+{
     OWSAssertDebug(threadId);
     OWSAssertDebug(address);
     OWSAssertDebug(transaction);