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,27 +209,13 @@
       );
     }
 
-    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 });
-      } else if (item.messageShapeType === 'multimedia') {
-        const height = item.inlineEngagementHeight
-          ? item.contentHeight + item.inlineEngagementHeight
-          : item.contentHeight;
-        viewStyle.push({ height });
-      }
-    }
-
     return (
       <View {...viewProps}>
         <AnimatedView style={{ opacity: contentAndHeaderOpacity }}>
           <MessageHeader item={item} focused={focused} display="lowContrast" />
         </AnimatedView>
         <AnimatedView style={[containerStyle, editedMessageStyle]}>
-          <View style={viewStyle}>
+          <View style={styles.alignment}>
             <View style={[styles.content, alignStyle]}>
               {deliveryIcon}
               {messageBox}
diff --git a/native/chat/failed-send.react.js b/native/chat/failed-send.react.js
--- a/native/chat/failed-send.react.js
+++ b/native/chat/failed-send.react.js
@@ -139,7 +139,6 @@
     paddingHorizontal: 3,
   },
   failedSendInfo: {
-    flex: 1,
     flexDirection: 'row',
     justifyContent: 'flex-end',
     marginRight: 20,
diff --git a/native/chat/message.react.js b/native/chat/message.react.js
--- a/native/chat/message.react.js
+++ b/native/chat/message.react.js
@@ -46,6 +46,7 @@
 type Props = {
   ...BaseProps,
   +keyboardState: ?KeyboardState,
+  +viewStyle: { +height: number },
 };
 class Message extends React.Component<Props> {
   shouldComponentUpdate(nextProps: Props): boolean {
@@ -64,6 +65,10 @@
   }
 
   render() {
+    // We don't force view height in dev mode because we
+    // want to measure it in the onLayout below to see if it's correct
+    const viewStyle = __DEV__ ? undefined : this.props.viewStyle;
+
     let message;
     if (this.props.item.messageShapeType === 'text') {
       message = (
@@ -75,6 +80,7 @@
           toggleFocus={this.props.toggleFocus}
           verticalBounds={this.props.verticalBounds}
           shouldDisplayPinIndicator={this.props.shouldDisplayPinIndicator}
+          style={viewStyle}
         />
       );
     } else if (this.props.item.messageShapeType === 'multimedia') {
@@ -85,6 +91,7 @@
           toggleFocus={this.props.toggleFocus}
           verticalBounds={this.props.verticalBounds}
           shouldDisplayPinIndicator={this.props.shouldDisplayPinIndicator}
+          style={viewStyle}
         />
       );
     } else {
@@ -96,6 +103,7 @@
           focused={this.props.focused}
           toggleFocus={this.props.toggleFocus}
           verticalBounds={this.props.verticalBounds}
+          style={viewStyle}
         />
       );
     }
@@ -117,7 +125,7 @@
     }
 
     const measuredHeight = event.nativeEvent.layout.height;
-    const expectedHeight = messageItemHeight(this.props.item);
+    const expectedHeight = this.props.viewStyle.height;
 
     const pixelRatio = 1 / PixelRatio.get();
     const distance = Math.abs(measuredHeight - expectedHeight);
@@ -146,7 +154,17 @@
 const ConnectedMessage: React.ComponentType<BaseProps> = React.memo<BaseProps>(
   function ConnectedMessage(props: BaseProps) {
     const keyboardState = React.useContext(KeyboardContext);
-    return <Message {...props} keyboardState={keyboardState} />;
+
+    const viewStyle = React.useMemo(
+      () => ({
+        height: messageItemHeight(props.item),
+      }),
+      [props.item],
+    );
+
+    return (
+      <Message {...props} keyboardState={keyboardState} viewStyle={viewStyle} />
+    );
   },
 );
 
diff --git a/native/chat/robotext-message.react.js b/native/chat/robotext-message.react.js
--- a/native/chat/robotext-message.react.js
+++ b/native/chat/robotext-message.react.js
@@ -196,19 +196,12 @@
 
   const contentAndHeaderOpacity = useContentAndHeaderOpacity(item);
 
-  const viewStyle = {};
-  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
-    viewStyle.height = item.contentHeight;
-  }
-
   return (
     <View {...viewProps}>
       <AnimatedView style={{ opacity: contentAndHeaderOpacity }}>
         {timestamp}
       </AnimatedView>
-      <View onLayout={onLayout} ref={viewRef} style={viewStyle}>
+      <View onLayout={onLayout} ref={viewRef}>
         <AnimatedView style={{ opacity: contentAndHeaderOpacity }}>
           <InnerRobotextMessage
             item={item}