diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContactShare+Private.h b/SignalServiceKit/src/Messages/Interactions/OWSContactShare+Private.h
index 0e5922822..7cd8a73f2 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSContactShare+Private.h
+++ b/SignalServiceKit/src/Messages/Interactions/OWSContactShare+Private.h
@@ -6,6 +6,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+// These private interfaces expose setter accessors to facilitate
+// construction of fake messages, etc.
 @interface OWSContactSharePhoneNumber (Private)
 
 @property (nonatomic) OWSContactSharePhoneType phoneType;
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContactShare.m b/SignalServiceKit/src/Messages/Interactions/OWSContactShare.m
index e04ea2f10..082d6c2e1 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSContactShare.m
+++ b/SignalServiceKit/src/Messages/Interactions/OWSContactShare.m
@@ -10,18 +10,57 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@interface OWSContactSharePhoneNumber ()
+
+@property (nonatomic) OWSContactSharePhoneType phoneType;
+@property (nonatomic, nullable) NSString *label;
+
+@property (nonatomic) NSString *phoneNumber;
+
+@end
+
+#pragma mark -
+
 @implementation OWSContactSharePhoneNumber
 
 @end
 
 #pragma mark -
 
+@interface OWSContactShareEmail ()
+
+@property (nonatomic) OWSContactShareEmailType emailType;
+@property (nonatomic, nullable) NSString *label;
+
+@property (nonatomic) NSString *email;
+
+@end
+
+#pragma mark -
+
 @implementation OWSContactShareEmail
 
 @end
 
 #pragma mark -
 
+@interface OWSContactShareAddress ()
+
+@property (nonatomic) OWSContactShareAddressType addressType;
+@property (nonatomic, nullable) NSString *label;
+
+@property (nonatomic, nullable) NSString *street;
+@property (nonatomic, nullable) NSString *pobox;
+@property (nonatomic, nullable) NSString *neighborhood;
+@property (nonatomic, nullable) NSString *city;
+@property (nonatomic, nullable) NSString *region;
+@property (nonatomic, nullable) NSString *postcode;
+@property (nonatomic, nullable) NSString *country;
+
+@end
+
+#pragma mark -
+
 @implementation OWSContactShareAddress
 
 @end
@@ -30,6 +69,19 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface OWSContactShare ()
 
+@property (nonatomic, nullable) NSString *givenName;
+@property (nonatomic, nullable) NSString *familyName;
+@property (nonatomic, nullable) NSString *nameSuffix;
+@property (nonatomic, nullable) NSString *namePrefix;
+@property (nonatomic, nullable) NSString *middleName;
+
+@property (nonatomic, nullable) NSArray<OWSContactSharePhoneNumber *> *phoneNumbers;
+@property (nonatomic, nullable) NSArray<OWSContactShareEmail *> *emails;
+@property (nonatomic, nullable) NSArray<OWSContactShareAddress *> *addresses;
+
+@property (nonatomic, nullable) TSAttachment *avatar;
+@property (nonatomic) BOOL isProfileAvatar;
+
 @end
 
 #pragma mark -