diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
index 1a52f7555..789b94fbb 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
@@ -10,8 +10,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (NSString *)cellReuseIdentifier;
 
-+ (UIFont *)defaultTextMessageFont;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index b8ceb122c..4b1178416 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -147,16 +147,11 @@ NS_ASSUME_NONNULL_BEGIN
     return NSStringFromClass([self class]);
 }
 
-+ (UIFont *)defaultTextMessageFont
-{
-    return [UIFont ows_dynamicTypeBodyFont];
-}
-
 - (UIFont *)textMessageFont
 {
     OWSAssert(DisplayableText.kMaxJumbomojiCount == 5);
 
-    CGFloat basePointSize = self.class.defaultTextMessageFont.pointSize;
+    CGFloat basePointSize = [UIFont ows_dynamicTypeBodyFont].pointSize;
     switch (self.displayableBodyText.jumbomojiCount) {
         case 0:
             break;
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h
index d4f455157..09cfcd274 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h
@@ -20,9 +20,11 @@ NS_ASSUME_NONNULL_BEGIN
 // Measurement
 - (CGSize)sizeForMaxWidth:(CGFloat)maxWidth;
 
+// Factory method for "message bubble" views.
 + (OWSQuotedMessageView *)quotedMessageViewForConversation:(TSQuotedMessage *)quotedMessage
                                      displayableQuotedText:(nullable DisplayableText *)displayableQuotedText;
 
+// Factory method for "message compose" views.
 + (OWSQuotedMessageView *)quotedMessageViewForPreview:(TSQuotedMessage *)quotedMessage;
 
 @end
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
index 996aba485..835091e36 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
@@ -6,7 +6,6 @@
 #import "ConversationViewItem.h"
 #import "Environment.h"
 #import "OWSBubbleStrokeView.h"
-#import "OWSMessageCell.h"
 #import "Signal-Swift.h"
 #import <SignalMessaging/OWSContactsManager.h>
 #import <SignalMessaging/SignalMessaging-Swift.h>
@@ -68,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     _quotedMessage = quotedMessage;
     _displayableQuotedText = displayableQuotedText;
-    _textMessageFont = OWSMessageCell.defaultTextMessageFont;
+    _textMessageFont = [UIFont ows_dynamicTypeBodyFont];
 
     return self;
 }
@@ -76,13 +75,13 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)hasQuotedAttachment
 {
     return (self.quotedMessage.contentType.length > 0
-        && ![NSObject isNullableObject:self.quotedMessage.contentType equalTo:OWSMimeTypeOversizeTextMessage]);
+        && ![OWSMimeTypeOversizeTextMessage isEqualToString:self.quotedMessage.contentType]);
 }
 
 - (BOOL)hasQuotedAttachmentThumbnail
 {
     return (self.quotedMessage.contentType.length > 0
-        && ![NSObject isNullableObject:self.quotedMessage.contentType equalTo:OWSMimeTypeOversizeTextMessage] &&
+        && ![OWSMimeTypeOversizeTextMessage isEqualToString:self.quotedMessage.contentType] &&
         [TSAttachmentStream hasThumbnailForMimeType:self.quotedMessage.contentType]);
 }
 
diff --git a/SignalMessaging/categories/UIFont+OWS.h b/SignalMessaging/categories/UIFont+OWS.h
index 2bb7cb392..715f5bf52 100644
--- a/SignalMessaging/categories/UIFont+OWS.h
+++ b/SignalMessaging/categories/UIFont+OWS.h
@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (UIFont *)ows_boldFontWithSize:(CGFloat)size;
 
++ (UIFont *)ows_dynamicTypeBodyFont:(CGFloat)size;
+
 #pragma mark - Icon Fonts
 
 + (UIFont *)ows_fontAwesomeFont:(CGFloat)size;
diff --git a/SignalMessaging/categories/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m
index 1275111f8..87532213b 100644
--- a/SignalMessaging/categories/UIFont+OWS.m
+++ b/SignalMessaging/categories/UIFont+OWS.m
@@ -33,6 +33,11 @@ NS_ASSUME_NONNULL_BEGIN
     return [UIFont boldSystemFontOfSize:size];
 }
 
++ (UIFont *)ows_dynamicTypeBodyFont:(CGFloat)size
+{
+    return [UIFont ows_dynamicTypeBodyFont];
+}
+
 #pragma mark - Icon Fonts
 
 + (UIFont *)ows_fontAwesomeFont:(CGFloat)size