diff --git a/Signal/src/network/PushManager.m b/Signal/src/network/PushManager.m
index 2cd4cca8d..1fa016f7d 100644
--- a/Signal/src/network/PushManager.m
+++ b/Signal/src/network/PushManager.m
@@ -14,6 +14,7 @@
 #import <SignalServiceKit/OWSReadReceiptsProcessor.h>
 #import <SignalServiceKit/OWSSignalService.h>
 #import <SignalServiceKit/TSAccountManager.h>
+#import <SignalServiceKit/TSIncomingMessage.h>
 #import <SignalServiceKit/TSOutgoingMessage.h>
 #import <SignalServiceKit/TSSocketManager.h>
 
diff --git a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
index 2eb3d4050..e7224c99e 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.h
@@ -106,6 +106,9 @@ NS_ASSUME_NONNULL_BEGIN
 // This will be 0 for messages created before we were tracking sourceDeviceId
 @property (nonatomic, readonly) UInt32 sourceDeviceId;
 
+// NOTE: Use messageAuthorId instead wherever possible.
+@property (nonatomic, readonly) NSString *authorId;
+
 - (NSString *)messageAuthorId;
 
 @end
diff --git a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m
index d9656d4d5..ddee46108 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage.m
@@ -16,8 +16,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface TSIncomingMessage ()
 
-@property (nonatomic, readonly) NSString *authorId;
-
 @property (nonatomic, getter=wasRead) BOOL read;
 
 @end