diff --git a/native/chat/message-header.react.js b/native/chat/message-header.react.js
index b00275480..cec0cc259 100644
--- a/native/chat/message-header.react.js
+++ b/native/chat/message-header.react.js
@@ -1,90 +1,82 @@
 // @flow
 
 import { stringForUser } from 'lib/shared/user-utils';
-import { connect } from 'lib/utils/redux-utils';
 import * as React from 'react';
 import { View } from 'react-native';
 
 import { SingleLine } from '../components/single-line.react';
-import type { AppState } from '../redux/redux-setup';
-import { styleSelector } from '../themes/colors';
+import { useStyles } from '../themes/colors';
 
 import { clusterEndHeight } from './composed-message.react';
 import type { ChatMessageInfoItemWithHeight } from './message.react';
 import type { DisplayType } from './timestamp.react';
 import { Timestamp, timestampHeight } from './timestamp.react';
 
 type Props = {|
-  item: ChatMessageInfoItemWithHeight,
-  focused: boolean,
-  display: DisplayType,
-  // Redux state
-  styles: typeof styles,
+  +item: ChatMessageInfoItemWithHeight,
+  +focused: boolean,
+  +display: DisplayType,
 |};
 function MessageHeader(props: Props) {
+  const styles = useStyles(unboundStyles);
   const { item, focused, display } = props;
   const { creator, time } = item.messageInfo;
   const { isViewer } = creator;
   const modalDisplay = display === 'modal';
 
   let authorName = null;
   if (!isViewer && (modalDisplay || item.startsCluster)) {
-    const style = [props.styles.authorName];
+    const style = [styles.authorName];
     if (modalDisplay) {
-      style.push(props.styles.modal);
+      style.push(styles.modal);
     }
     authorName = (
       <SingleLine style={style}>{stringForUser(creator)}</SingleLine>
     );
   }
 
   const timestamp =
     modalDisplay || item.startsConversation ? (
       <Timestamp time={time} display={display} />
     ) : null;
 
   let style = null;
   if (focused && !modalDisplay) {
     let topMargin = 0;
     if (!item.startsCluster && !item.messageInfo.creator.isViewer) {
       topMargin += authorNameHeight + clusterEndHeight;
     }
     if (!item.startsConversation) {
       topMargin += timestampHeight;
     }
     style = { marginTop: topMargin };
   }
 
   return (
     <View style={style}>
       {timestamp}
       {authorName}
     </View>
   );
 }
 
 const authorNameHeight = 25;
 
-const styles = {
+const unboundStyles = {
   authorName: {
     bottom: 0,
     color: 'listBackgroundSecondaryLabel',
     fontSize: 14,
     height: authorNameHeight,
     marginLeft: 12,
     marginRight: 7,
     paddingHorizontal: 12,
     paddingVertical: 4,
   },
   modal: {
     // high contrast framed against OverlayNavigator-dimmed background
     color: 'white',
   },
 };
-const stylesSelector = styleSelector(styles);
 
-const ConnectedMessageHeader = connect((state: AppState) => ({
-  styles: stylesSelector(state),
-}))(MessageHeader);
-
-export { ConnectedMessageHeader as MessageHeader, authorNameHeight };
+export { MessageHeader, authorNameHeight };