diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
index ddf2887c0..3483184b5 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.h
@@ -37,9 +37,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) NSDate *creationTimestamp;
 
 #if TARGET_OS_IPHONE
-- (nullable UIImage *)originalImage;
-- (nullable UIImage *)thumbnailImage;
-- (nullable NSData *)thumbnailData;
 - (nullable NSData *)validStillImageData;
 #endif
 
@@ -48,13 +45,16 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)isVideo;
 - (BOOL)isAudio;
 
-+ (BOOL)hasThumbnailForMimeType:(NSString *)contentType;
-
+- (nullable UIImage *)originalImage;
 - (nullable NSString *)originalFilePath;
 - (nullable NSURL *)originalMediaURL;
 
+- (nullable UIImage *)thumbnailImage;
+- (nullable NSData *)thumbnailData;
 - (nullable NSString *)thumbnailPath;
 
++ (BOOL)hasThumbnailForMimeType:(NSString *)contentType;
+
 - (nullable NSData *)readDataFromFileWithError:(NSError **)error;
 - (BOOL)writeData:(NSData *)data error:(NSError **)error;
 - (BOOL)writeDataSource:(DataSource *)dataSource;