diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index 04cf543f5..fc2a0fd75 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -240,6 +240,9 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes
             return self.hasBodyText;
         case OWSMessageCellType_ContactShare:
             return NO;
+        case OWSMessageCellType_MediaGallery:
+            // TODO: How will media gallery captions work?
+            return NO;
     }
 }
 
@@ -327,6 +330,10 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes
         case OWSMessageCellType_ContactShare:
             bodyMediaView = [self loadViewForContactShare];
             break;
+        case OWSMessageCellType_MediaGallery:
+            // TODO:
+            bodyMediaView = [self loadViewForGenericAttachment];
+            break;
     }
 
     if (bodyMediaView) {
@@ -613,6 +620,9 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes
         case OWSMessageCellType_DownloadingAttachment:
         case OWSMessageCellType_ContactShare:
             return NO;
+        case OWSMessageCellType_MediaGallery:
+            // TODO:
+            return NO;
     }
 }
 
@@ -1207,6 +1217,10 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes
 
             result = CGSizeMake(maxMessageWidth, [OWSContactShareView bubbleHeight]);
             break;
+        case OWSMessageCellType_MediaGallery:
+            // Always use a "max size square".
+            result = CGSizeMake(maxMessageWidth, maxMessageWidth);
+            break;
     }
 
     OWSAssertDebug(result.width <= maxMessageWidth);
@@ -1423,6 +1437,10 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes
         // TODO: Handle this case.
         return NO;
     }
+    if (self.cellType == OWSMessageCellType_MediaGallery) {
+        // TODO:
+        return NO;
+    }
     if (!self.attachmentStream) {
         return NO;
     }
@@ -1591,6 +1609,9 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes
         case OWSMessageCellType_ContactShare:
             [self.delegate didTapContactShareViewItem:self.viewItem];
             break;
+        case OWSMessageCellType_MediaGallery:
+            // TODO:
+            break;
     }
 }