diff --git a/native/chat/composed-message.react.js b/native/chat/composed-message.react.js
--- a/native/chat/composed-message.react.js
+++ b/native/chat/composed-message.react.js
@@ -209,13 +209,22 @@
       );
     }
 
+    const viewStyle = [styles.alignment];
+    if (!__DEV__) {
+      // We don't force view height in dev mode because we
+      // want to measure it in Message to see if it's correct
+      if (item.messageShapeType === 'text') {
+        viewStyle.push({ height: item.contentHeight });
+      }
+    }
+
     return (
       <View {...viewProps}>
         <AnimatedView style={{ opacity: contentAndHeaderOpacity }}>
           <MessageHeader item={item} focused={focused} display="lowContrast" />
         </AnimatedView>
         <AnimatedView style={[containerStyle, editedMessageStyle]}>
-          <View style={styles.alignment}>
+          <View style={viewStyle}>
             <View style={[styles.content, alignStyle]}>
               {deliveryIcon}
               {messageBox}
diff --git a/native/chat/inner-text-message.react.js b/native/chat/inner-text-message.react.js
--- a/native/chat/inner-text-message.react.js
+++ b/native/chat/inner-text-message.react.js
@@ -95,12 +95,6 @@
 
   const cornerStyle = getRoundedContainerStyle(filterCorners(allCorners, item));
 
-  if (!__DEV__) {
-    // We don't force view height in dev mode because we
-    // want to measure it in Message to see if it's correct
-    messageStyle.height = item.contentHeight;
-  }
-
   const rules = useTextMessageMarkdownRules(darkColor);
   const textMessageMarkdown = useTextMessageMarkdown(item.messageInfo);