diff --git a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m
index 22d8ab3d3..395b69f4c 100644
--- a/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m
+++ b/SignalServiceKit/src/Messages/DeviceSyncing/OWSSyncGroupsRequestMessage.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSSyncGroupsRequestMessage.h"
@@ -55,6 +55,7 @@ NS_ASSUME_NONNULL_BEGIN
     [groupContextBuilder setId:self.groupId];
 
     OWSSignalServiceProtosDataMessageBuilder *builder = [OWSSignalServiceProtosDataMessageBuilder new];
+    [builder setTimestamp:self.timestamp];
     [builder setGroupBuilder:groupContextBuilder];
 
     return builder;
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m
index 12ef6ef2b..5da1b3fbd 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingMessagesConfigurationMessage.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSDisappearingMessagesConfigurationMessage.h"
@@ -38,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (OWSSignalServiceProtosDataMessageBuilder *)dataMessageBuilder
 {
     OWSSignalServiceProtosDataMessageBuilder *dataMessageBuilder = [super dataMessageBuilder];
+    [dataMessageBuilder setTimestamp:self.timestamp];
     [dataMessageBuilder setFlags:OWSSignalServiceProtosDataMessageFlagsExpirationTimerUpdate];
     if (self.configuration.isEnabled) {
         [dataMessageBuilder setExpireTimer:self.configuration.durationSeconds];
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m
index e4db0ba18..562c24099 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSEndSessionMessage.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSEndSessionMessage.h"
@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (OWSSignalServiceProtosDataMessageBuilder *)dataMessageBuilder
 {
     OWSSignalServiceProtosDataMessageBuilder *builder = [super dataMessageBuilder];
+    [builder setTimestamp:self.timestamp];
     [builder setFlags:OWSSignalServiceProtosDataMessageFlagsEndSession];
 
     return builder;
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
index 254454c59..b7003f105 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage.m
@@ -446,6 +446,7 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec
 {
     TSThread *thread = self.thread;
     OWSSignalServiceProtosDataMessageBuilder *builder = [OWSSignalServiceProtosDataMessageBuilder new];
+    [builder setTimestamp:self.timestamp];
     [builder setBody:self.body];
     BOOL attachmentWasGroupAvatar = NO;
     if ([thread isKindOfClass:[TSGroupThread class]]) {
@@ -495,6 +496,7 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec
     OWSAssert(self.thread);
 
     OWSSignalServiceProtosDataMessageBuilder *builder = [self dataMessageBuilder];
+    [builder setTimestamp:self.timestamp];
     [builder addLocalProfileKeyIfNecessary:self.thread recipientId:recipientId];
     return [builder build];
 }
diff --git a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m
index 914bf5f0e..c79e0a3ba 100644
--- a/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m
+++ b/SignalServiceKit/src/Messages/OWSProfileKeyMessage.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSProfileKeyMessage.h"
@@ -27,6 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(self.thread);
     
     OWSSignalServiceProtosDataMessageBuilder *builder = [self dataMessageBuilder];
+    [builder setTimestamp:self.timestamp];
     [builder addLocalProfileKey];
     [builder setFlags:OWSSignalServiceProtosDataMessageFlagsProfileKeyUpdate];