diff --git a/package/expo-package/yarn.lock b/package/expo-package/yarn.lock
index fc5c3720cb..aeb2acdeea 100644
--- a/package/expo-package/yarn.lock
+++ b/package/expo-package/yarn.lock
@@ -4733,10 +4733,10 @@ stream-buffers@2.2.x, stream-buffers@~2.2.0:
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
   integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
 
-stream-chat-react-native-core@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.7.0.tgz#d9e8c8ca57db93f148ef8acab93d3552f425eb36"
-  integrity sha512-Ue/euBMJ2h/H33hp58znfOMFzocgyW+dqvS8qiCooO5RZ26zQYGSDvmp8TeYyiBpqwM927vqfrPmPqOeXb12IQ==
+stream-chat-react-native-core@6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.7.1.tgz#37cdfbc5c7f8a5bac5634b954da4bbdcd2fb95f2"
+  integrity sha512-4ePEMt1W+iw3zUulSDRFO9Nt4HPa8kW6wJ3Qv+ZN+y886rvcUuTuH18MFrdrJtHYb+UxCU+X3oz++3qzq7Jzxw==
   dependencies:
     "@gorhom/bottom-sheet" "^5.1.1"
     dayjs "1.10.5"
diff --git a/package/native-package/yarn.lock b/package/native-package/yarn.lock
index f7801bd9b0..317331eb77 100644
--- a/package/native-package/yarn.lock
+++ b/package/native-package/yarn.lock
@@ -3409,10 +3409,10 @@ statuses@~1.5.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-stream-chat-react-native-core@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.7.0.tgz#d9e8c8ca57db93f148ef8acab93d3552f425eb36"
-  integrity sha512-Ue/euBMJ2h/H33hp58znfOMFzocgyW+dqvS8qiCooO5RZ26zQYGSDvmp8TeYyiBpqwM927vqfrPmPqOeXb12IQ==
+stream-chat-react-native-core@6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.7.1.tgz#37cdfbc5c7f8a5bac5634b954da4bbdcd2fb95f2"
+  integrity sha512-4ePEMt1W+iw3zUulSDRFO9Nt4HPa8kW6wJ3Qv+ZN+y886rvcUuTuH18MFrdrJtHYb+UxCU+X3oz++3qzq7Jzxw==
   dependencies:
     "@gorhom/bottom-sheet" "^5.1.1"
     dayjs "1.10.5"
diff --git a/package/src/components/Message/Message.tsx b/package/src/components/Message/Message.tsx
index ae95f6c4ac..c9ca11701c 100644
--- a/package/src/components/Message/Message.tsx
+++ b/package/src/components/Message/Message.tsx
@@ -296,7 +296,7 @@ const MessageWithContext = <
   const {
     theme: {
       colors: { targetedMessageBackground },
-      messageSimple: { targetedMessageContainer, unreadUnderlayColor },
+      messageSimple: { targetedMessageContainer, unreadUnderlayColor, wrapper },
       screenPadding,
     },
   } = useTheme();
@@ -737,8 +737,12 @@ const MessageWithContext = <
         <View
           style={[
             { marginTop: 2, paddingHorizontal: screenPadding },
+            wrapper,
             (isTargetedMessage || message.pinned) && !isMessageTypeDeleted
-              ? { backgroundColor: targetedMessageBackground, ...targetedMessageContainer }
+              ? {
+                  backgroundColor: targetedMessageBackground,
+                  ...targetedMessageContainer,
+                }
               : {},
           ]}
           testID='message-wrapper'
diff --git a/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap b/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
index b05aa25bed..176e5615e3 100644
--- a/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
+++ b/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
@@ -276,6 +276,7 @@ exports[`Thread should match thread snapshot 1`] = `
                           "paddingHorizontal": 8,
                         },
                         {},
+                        {},
                       ]
                     }
                     testID="message-wrapper"
@@ -787,6 +788,7 @@ exports[`Thread should match thread snapshot 1`] = `
                           "paddingHorizontal": 8,
                         },
                         {},
+                        {},
                       ]
                     }
                     testID="message-wrapper"
@@ -1336,6 +1338,7 @@ exports[`Thread should match thread snapshot 1`] = `
                           "paddingHorizontal": 8,
                         },
                         {},
+                        {},
                       ]
                     }
                     testID="message-wrapper"
@@ -1837,6 +1840,7 @@ exports[`Thread should match thread snapshot 1`] = `
                             "paddingHorizontal": 8,
                           },
                           {},
+                          {},
                         ]
                       }
                       testID="message-wrapper"
diff --git a/package/src/components/UIComponents/BottomSheetModal.tsx b/package/src/components/UIComponents/BottomSheetModal.tsx
index 81e2bf03dd..4176eb86da 100644
--- a/package/src/components/UIComponents/BottomSheetModal.tsx
+++ b/package/src/components/UIComponents/BottomSheetModal.tsx
@@ -1,4 +1,4 @@
-import React, { PropsWithChildren, useEffect } from 'react';
+import React, { PropsWithChildren, useEffect, useMemo } from 'react';
 import {
   Animated,
   Keyboard,
@@ -50,13 +50,17 @@ export const BottomSheetModal = (props: PropsWithChildren<BottomSheetModalProps>
     },
   } = useTheme();
 
-  const translateY = new Animated.Value(height);
+  const translateY = useMemo(() => new Animated.Value(height), [height]);
 
-  const openAnimation = Animated.timing(translateY, {
-    duration: 200,
-    toValue: 0,
-    useNativeDriver: true,
-  });
+  const openAnimation = useMemo(
+    () =>
+      Animated.timing(translateY, {
+        duration: 200,
+        toValue: 0,
+        useNativeDriver: true,
+      }),
+    [translateY],
+  );
 
   const closeAnimation = Animated.timing(translateY, {
     duration: 50,
diff --git a/package/src/contexts/themeContext/utils/theme.ts b/package/src/contexts/themeContext/utils/theme.ts
index 3357bdbba8..9de896c54b 100644
--- a/package/src/contexts/themeContext/utils/theme.ts
+++ b/package/src/contexts/themeContext/utils/theme.ts
@@ -674,6 +674,7 @@ export type Theme = {
       roundedView: ViewStyle;
     };
     unreadUnderlayColor?: ColorValue;
+    wrapper: ViewStyle;
   };
   poll: {
     allOptions: {
@@ -1466,6 +1467,7 @@ export const defaultTheme: Theme = {
       container: {},
       roundedView: {},
     },
+    wrapper: {},
   },
   poll: {
     allOptions: {