diff --git a/native/chat/composed-message-constants.js b/native/chat/composed-message-constants.js
new file mode 100644
--- /dev/null
+++ b/native/chat/composed-message-constants.js
@@ -0,0 +1,3 @@
+// @flow
+
+export const clusterEndHeight = 7;
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
@@ -13,6 +13,7 @@
 import { type Colors, useColors } from '../themes/colors';
 import type { ChatMessageInfoItemWithHeight } from '../types/chat-types';
 import { type AnimatedStyleObj, AnimatedView } from '../types/styles';
+import { clusterEndHeight } from './composed-message-constants';
 import { useComposedMessageMaxWidth } from './composed-message-width';
 import { FailedSend } from './failed-send.react';
 import {
@@ -29,8 +30,6 @@
 const { Node } = Animated;
 /* eslint-enable import/no-named-as-default-member */
 
-const clusterEndHeight = 7;
-
 type SwipeOptions = 'reply' | 'sidebar' | 'both' | 'none';
 type BaseProps = {
   ...React.ElementConfig<typeof View>,
@@ -221,4 +220,5 @@
     );
   },
 );
-export { ConnectedComposedMessage as ComposedMessage, clusterEndHeight };
+
+export default ConnectedComposedMessage;
diff --git a/native/chat/message-header.react.js b/native/chat/message-header.react.js
--- a/native/chat/message-header.react.js
+++ b/native/chat/message-header.react.js
@@ -8,7 +8,7 @@
 import { SingleLine } from '../components/single-line.react';
 import { useStyles } from '../themes/colors';
 import type { ChatMessageInfoItemWithHeight } from '../types/chat-types';
-import { clusterEndHeight } from './composed-message.react';
+import { clusterEndHeight } from './composed-message-constants';
 import type { DisplayType } from './timestamp.react';
 import { Timestamp, timestampHeight } from './timestamp.react';
 
diff --git a/native/chat/multimedia-message-utils.js b/native/chat/multimedia-message-utils.js
--- a/native/chat/multimedia-message-utils.js
+++ b/native/chat/multimedia-message-utils.js
@@ -10,7 +10,7 @@
   ChatMultimediaMessageInfoItem,
   MultimediaContentSizes,
 } from '../types/chat-types';
-import { clusterEndHeight } from './composed-message.react';
+import { clusterEndHeight } from './composed-message-constants';
 import { failedSendHeight } from './failed-send.react';
 import {
   inlineSidebarMarginBottom,
diff --git a/native/chat/multimedia-message.react.js b/native/chat/multimedia-message.react.js
--- a/native/chat/multimedia-message.react.js
+++ b/native/chat/multimedia-message.react.js
@@ -23,7 +23,7 @@
 import type { ChatMultimediaMessageInfoItem } from '../types/chat-types';
 import { type VerticalBounds } from '../types/layout-types';
 import type { LayoutCoordinates } from '../types/layout-types';
-import { ComposedMessage } from './composed-message.react';
+import ComposedMessage from './composed-message.react';
 import { InnerMultimediaMessage } from './inner-multimedia-message.react';
 import { multimediaMessageTooltipHeight } from './multimedia-message-tooltip-modal.react';
 import {
diff --git a/native/chat/text-message.react.js b/native/chat/text-message.react.js
--- a/native/chat/text-message.react.js
+++ b/native/chat/text-message.react.js
@@ -21,7 +21,7 @@
 import type { ChatTextMessageInfoItemWithHeight } from '../types/chat-types';
 import type { VerticalBounds } from '../types/layout-types';
 import type { ChatNavigationProp } from './chat.react';
-import { ComposedMessage } from './composed-message.react';
+import ComposedMessage from './composed-message.react';
 import { InnerTextMessage } from './inner-text-message.react';
 import textMessageSendFailed from './text-message-send-failed';
 import { textMessageTooltipHeight } from './text-message-tooltip-modal.react';
diff --git a/native/chat/utils.js b/native/chat/utils.js
--- a/native/chat/utils.js
+++ b/native/chat/utils.js
@@ -26,7 +26,7 @@
 import type { LayoutCoordinates, VerticalBounds } from '../types/layout-types';
 import type { AnimatedViewStyle } from '../types/styles';
 import { ChatContext, useHeightMeasurer } from './chat-context';
-import { clusterEndHeight } from './composed-message.react';
+import { clusterEndHeight } from './composed-message-constants';
 import { failedSendHeight } from './failed-send.react';
 import {
   inlineSidebarHeight,