diff --git a/lib/shared/relationship-utils.js b/lib/shared/relationship-utils.js
index 1e17368ec..cc65dc327 100644
--- a/lib/shared/relationship-utils.js
+++ b/lib/shared/relationship-utils.js
@@ -1,43 +1,58 @@
 // @flow
 
 import {
   type RelationshipButton,
+  type UserRelationshipStatus,
   userRelationshipStatus,
   relationshipButtons,
 } from '../types/relationship-types';
 import type { UserInfo } from '../types/user-types';
 
 function sortIDs(firstId: string, secondId: string): string[] {
   return [Number(firstId), Number(secondId)]
     .sort((a, b) => a - b)
     .map((num) => num.toString());
 }
 
 function getAvailableRelationshipButtons(
   userInfo: UserInfo,
 ): RelationshipButton[] {
   const relationship = userInfo.relationshipStatus;
 
   if (relationship === userRelationshipStatus.FRIEND) {
     return [relationshipButtons.UNFRIEND, relationshipButtons.BLOCK];
   } else if (relationship === userRelationshipStatus.BLOCKED_VIEWER) {
     return [relationshipButtons.BLOCK];
   } else if (
     relationship === userRelationshipStatus.BOTH_BLOCKED ||
     relationship === userRelationshipStatus.BLOCKED_BY_VIEWER
   ) {
     return [relationshipButtons.UNBLOCK];
   } else if (relationship === userRelationshipStatus.REQUEST_RECEIVED) {
     return [
       relationshipButtons.ACCEPT,
       relationshipButtons.REJECT,
       relationshipButtons.BLOCK,
     ];
   } else if (relationship === userRelationshipStatus.REQUEST_SENT) {
     return [relationshipButtons.WITHDRAW, relationshipButtons.BLOCK];
   } else {
     return [relationshipButtons.FRIEND, relationshipButtons.BLOCK];
   }
 }
 
-export { sortIDs, getAvailableRelationshipButtons };
+function relationshipBlockedInEitherDirection(
+  relationshipStatus: UserRelationshipStatus,
+): boolean {
+  return (
+    relationshipStatus === userRelationshipStatus.BLOCKED_VIEWER ||
+    relationshipStatus === userRelationshipStatus.BLOCKED_BY_VIEWER ||
+    relationshipStatus === userRelationshipStatus.BOTH_BLOCKED
+  );
+}
+
+export {
+  sortIDs,
+  getAvailableRelationshipButtons,
+  relationshipBlockedInEitherDirection,
+};
diff --git a/native/chat/multimedia-message-multimedia.react.js b/native/chat/multimedia-message-multimedia.react.js
index f84910c7c..07ae7821d 100644
--- a/native/chat/multimedia-message-multimedia.react.js
+++ b/native/chat/multimedia-message-multimedia.react.js
@@ -1,330 +1,344 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 import { View, StyleSheet } from 'react-native';
 import Animated from 'react-native-reanimated';
+import { useSelector } from 'react-redux';
 
 import { messageKey } from 'lib/shared/message-utils';
+import { relationshipBlockedInEitherDirection } from 'lib/shared/relationship-utils';
 import { threadHasPermission } from 'lib/shared/thread-utils';
 import { type MediaInfo } from 'lib/types/media-types';
 import { threadPermissions } from 'lib/types/thread-types';
+import type { UserInfo } from 'lib/types/user-types';
 
 import { type PendingMultimediaUpload } from '../input/input-state';
 import {
   type KeyboardState,
   KeyboardContext,
 } from '../keyboard/keyboard-state';
 import {
   OverlayContext,
   type OverlayContextType,
 } from '../navigation/overlay-context';
 import type { NavigationRoute } from '../navigation/route-names';
 import {
   MultimediaModalRouteName,
   MultimediaTooltipModalRouteName,
 } from '../navigation/route-names';
 import { type Colors, useColors } from '../themes/colors';
 import { type VerticalBounds } from '../types/layout-types';
 import type { ViewStyle } from '../types/styles';
 import type { ChatNavigationProp } from './chat.react';
 import InlineMultimedia from './inline-multimedia.react';
 import type { ChatMultimediaMessageInfoItem } from './multimedia-message.react';
 import { multimediaTooltipHeight } from './multimedia-tooltip-modal.react';
 
 /* eslint-disable import/no-named-as-default-member */
 const { Value, sub, interpolate, Extrapolate } = Animated;
 /* eslint-enable import/no-named-as-default-member */
 
 type BaseProps = {|
   +mediaInfo: MediaInfo,
   +item: ChatMultimediaMessageInfoItem,
   +navigation: ChatNavigationProp<'MessageList'>,
   +route: NavigationRoute<'MessageList'>,
   +verticalBounds: ?VerticalBounds,
   +verticalOffset: number,
   +style: ViewStyle,
   +postInProgress: boolean,
   +pendingUpload: ?PendingMultimediaUpload,
   +messageFocused: boolean,
   +toggleMessageFocus: (messageKey: string) => void,
 |};
 type Props = {|
   ...BaseProps,
   // Redux state
   +colors: Colors,
+  +messageCreatorUserInfo: UserInfo,
   // withKeyboardState
   +keyboardState: ?KeyboardState,
   // withOverlayContext
   +overlayContext: ?OverlayContextType,
 |};
 type State = {|
   +opacity: number | Value,
 |};
 class MultimediaMessageMultimedia extends React.PureComponent<Props, State> {
   view: ?React.ElementRef<typeof View>;
   clickable = true;
 
   constructor(props: Props) {
     super(props);
     this.state = {
       opacity: this.getOpacity(),
     };
   }
 
   static getStableKey(props: Props) {
     const { item, mediaInfo } = props;
     return `multimedia|${messageKey(item.messageInfo)}|${mediaInfo.index}`;
   }
 
   static getOverlayContext(props: Props) {
     const { overlayContext } = props;
     invariant(
       overlayContext,
       'MultimediaMessageMultimedia should have OverlayContext',
     );
     return overlayContext;
   }
 
   static getModalOverlayPosition(props: Props) {
     const overlayContext = MultimediaMessageMultimedia.getOverlayContext(props);
     const { visibleOverlays } = overlayContext;
     for (let overlay of visibleOverlays) {
       if (
         overlay.routeName === MultimediaModalRouteName &&
         overlay.presentedFrom === props.route.key &&
         overlay.routeKey === MultimediaMessageMultimedia.getStableKey(props)
       ) {
         return overlay.position;
       }
     }
     return undefined;
   }
 
   getOpacity() {
     const overlayPosition = MultimediaMessageMultimedia.getModalOverlayPosition(
       this.props,
     );
     if (!overlayPosition) {
       return 1;
     }
     return sub(
       1,
       interpolate(overlayPosition, {
         inputRange: [0.1, 0.11],
         outputRange: [0, 1],
         extrapolate: Extrapolate.CLAMP,
       }),
     );
   }
 
   componentDidUpdate(prevProps: Props) {
     const overlayPosition = MultimediaMessageMultimedia.getModalOverlayPosition(
       this.props,
     );
     const prevOverlayPosition = MultimediaMessageMultimedia.getModalOverlayPosition(
       prevProps,
     );
     if (overlayPosition !== prevOverlayPosition) {
       this.setState({ opacity: this.getOpacity() });
     }
 
     const scrollIsDisabled =
       MultimediaMessageMultimedia.getOverlayContext(this.props)
         .scrollBlockingModalStatus !== 'closed';
     const scrollWasDisabled =
       MultimediaMessageMultimedia.getOverlayContext(prevProps)
         .scrollBlockingModalStatus !== 'closed';
     if (!scrollIsDisabled && scrollWasDisabled) {
       this.clickable = true;
     }
   }
 
   render() {
     const { opacity } = this.state;
     const wrapperStyles = [styles.container, { opacity }, this.props.style];
 
     const { mediaInfo, pendingUpload, postInProgress } = this.props;
     return (
       <Animated.View style={wrapperStyles}>
         <View style={styles.expand} onLayout={this.onLayout} ref={this.viewRef}>
           <InlineMultimedia
             mediaInfo={mediaInfo}
             onPress={this.onPress}
             onLongPress={this.onLongPress}
             postInProgress={postInProgress}
             pendingUpload={pendingUpload}
             spinnerColor={this.props.colors.listSeparatorLabel}
           />
         </View>
       </Animated.View>
     );
   }
 
   onLayout = () => {};
 
   viewRef = (view: ?React.ElementRef<typeof View>) => {
     this.view = view;
   };
 
   onPress = () => {
     if (this.dismissKeyboardIfShowing()) {
       return;
     }
 
     const {
       view,
       props: { verticalBounds },
     } = this;
     if (!view || !verticalBounds) {
       return;
     }
 
     if (!this.clickable) {
       return;
     }
     this.clickable = false;
 
     const overlayContext = MultimediaMessageMultimedia.getOverlayContext(
       this.props,
     );
     overlayContext.setScrollBlockingModalStatus('open');
 
     const { mediaInfo, item } = this.props;
     view.measure((x, y, width, height, pageX, pageY) => {
       const coordinates = { x: pageX, y: pageY, width, height };
       this.props.navigation.navigate({
         name: MultimediaModalRouteName,
         key: MultimediaMessageMultimedia.getStableKey(this.props),
         params: {
           presentedFrom: this.props.route.key,
           mediaInfo,
           item,
           initialCoordinates: coordinates,
           verticalBounds,
         },
       });
     });
   };
 
   visibleEntryIDs() {
     const result = ['save'];
 
     const canCreateSidebars = threadHasPermission(
       this.props.item.threadInfo,
       threadPermissions.CREATE_SIDEBARS,
     );
-    if (canCreateSidebars) {
+    const creatorRelationship = this.props.messageCreatorUserInfo
+      .relationshipStatus;
+    const creatorRelationshipHasBlock =
+      creatorRelationship &&
+      relationshipBlockedInEitherDirection(creatorRelationship);
+
+    if (canCreateSidebars && !creatorRelationshipHasBlock) {
       result.push('sidebar');
     }
 
     return result;
   }
 
   onLongPress = () => {
     if (this.dismissKeyboardIfShowing()) {
       return;
     }
 
     const {
       view,
       props: { verticalBounds },
     } = this;
     if (!view || !verticalBounds) {
       return;
     }
 
     if (!this.clickable) {
       return;
     }
     this.clickable = false;
 
     const {
       messageFocused,
       toggleMessageFocus,
       item,
       mediaInfo,
       verticalOffset,
     } = this.props;
     if (!messageFocused) {
       toggleMessageFocus(messageKey(item.messageInfo));
     }
 
     const overlayContext = MultimediaMessageMultimedia.getOverlayContext(
       this.props,
     );
     overlayContext.setScrollBlockingModalStatus('open');
 
     view.measure((x, y, width, height, pageX, pageY) => {
       const coordinates = { x: pageX, y: pageY, width, height };
 
       const multimediaTop = pageY;
       const multimediaBottom = pageY + height;
       const boundsTop = verticalBounds.y;
       const boundsBottom = verticalBounds.y + verticalBounds.height;
 
       const belowMargin = 20;
       const belowSpace = multimediaTooltipHeight + belowMargin;
       const { isViewer } = item.messageInfo.creator;
       const directlyAboveMargin = isViewer ? 30 : 50;
       const aboveMargin = verticalOffset === 0 ? directlyAboveMargin : 20;
       const aboveSpace = multimediaTooltipHeight + aboveMargin;
 
       let location = 'below',
         margin = belowMargin;
       if (
         multimediaBottom + belowSpace > boundsBottom &&
         multimediaTop - aboveSpace > boundsTop
       ) {
         location = 'above';
         margin = aboveMargin;
       }
 
       this.props.navigation.navigate({
         name: MultimediaTooltipModalRouteName,
         params: {
           presentedFrom: this.props.route.key,
           mediaInfo,
           item,
           initialCoordinates: coordinates,
           verticalOffset,
           verticalBounds,
           location,
           margin,
           visibleEntryIDs: this.visibleEntryIDs(),
         },
       });
     });
   };
 
   dismissKeyboardIfShowing = () => {
     const { keyboardState } = this.props;
     return !!(keyboardState && keyboardState.dismissKeyboardIfShowing());
   };
 }
 
 const styles = StyleSheet.create({
   container: {
     flex: 1,
     overflow: 'hidden',
   },
   expand: {
     flex: 1,
   },
 });
 
 export default React.memo<BaseProps>(
   function ConnectedMultimediaMessageMultimedia(props: BaseProps) {
     const colors = useColors();
     const keyboardState = React.useContext(KeyboardContext);
     const overlayContext = React.useContext(OverlayContext);
+    const messageCreatorUserInfo = useSelector(
+      (state) => state.userStore.userInfos[props.item.messageInfo.creator.id],
+    );
     return (
       <MultimediaMessageMultimedia
         {...props}
         colors={colors}
+        messageCreatorUserInfo={messageCreatorUserInfo}
         keyboardState={keyboardState}
         overlayContext={overlayContext}
       />
     );
   },
 );
diff --git a/native/chat/robotext-message.react.js b/native/chat/robotext-message.react.js
index ee8c35bad..74ccac06d 100644
--- a/native/chat/robotext-message.react.js
+++ b/native/chat/robotext-message.react.js
@@ -1,193 +1,202 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 import { View } from 'react-native';
+import { useSelector } from 'react-redux';
 
 import { messageKey } from 'lib/shared/message-utils';
+import { relationshipBlockedInEitherDirection } from 'lib/shared/relationship-utils';
 import { threadHasPermission } from 'lib/shared/thread-utils';
 import type { RobotextMessageInfo } from 'lib/types/message-types';
 import { type ThreadInfo, threadPermissions } from 'lib/types/thread-types';
 
 import { KeyboardContext } from '../keyboard/keyboard-state';
 import { OverlayContext } from '../navigation/overlay-context';
 import { RobotextMessageTooltipModalRouteName } from '../navigation/route-names';
 import type { NavigationRoute } from '../navigation/route-names';
 import type { VerticalBounds } from '../types/layout-types';
 import type { ChatNavigationProp } from './chat.react';
 import { InnerRobotextMessage } from './inner-robotext-message.react';
 import { robotextMessageTooltipHeight } from './robotext-message-tooltip-modal.react';
 import { Timestamp } from './timestamp.react';
 
 export type ChatRobotextMessageInfoItemWithHeight = {|
   itemType: 'message',
   messageShapeType: 'robotext',
   messageInfo: RobotextMessageInfo,
   threadInfo: ThreadInfo,
   startsConversation: boolean,
   startsCluster: boolean,
   endsCluster: boolean,
   robotext: string,
   contentHeight: number,
 |};
 
 function robotextMessageItemHeight(
   item: ChatRobotextMessageInfoItemWithHeight,
 ) {
   return item.contentHeight;
 }
 
 type Props = {|
   ...React.ElementConfig<typeof View>,
   +item: ChatRobotextMessageInfoItemWithHeight,
   +navigation: ChatNavigationProp<'MessageList'>,
   +route: NavigationRoute<'MessageList'>,
   +focused: boolean,
   +toggleFocus: (messageKey: string) => void,
   +verticalBounds: ?VerticalBounds,
 |};
 function RobotextMessage(props: Props) {
   const {
     item,
     navigation,
     route,
     focused,
     toggleFocus,
     verticalBounds,
     ...viewProps
   } = props;
 
   let timestamp = null;
   if (focused || item.startsConversation) {
     timestamp = (
       <Timestamp time={item.messageInfo.time} display="lowContrast" />
     );
   }
 
   const robotext = item.robotext;
   const keyboardState = React.useContext(KeyboardContext);
   const key = messageKey(item.messageInfo);
   const onPress = React.useCallback(() => {
     const didDismiss =
       keyboardState && keyboardState.dismissKeyboardIfShowing();
     if (!didDismiss) {
       toggleFocus(key);
     }
   }, [keyboardState, toggleFocus, key]);
 
   const overlayContext = React.useContext(OverlayContext);
   const viewRef = React.useRef<?React.ElementRef<typeof View>>();
 
+  const messageCreatorUserInfo = useSelector(
+    (state) => state.userStore.userInfos[props.item.messageInfo.creator.id],
+  );
   const visibleEntryIDs = React.useMemo(() => {
     const canCreateSidebars = threadHasPermission(
       item.threadInfo,
       threadPermissions.CREATE_SIDEBARS,
     );
+    const creatorRelationship = messageCreatorUserInfo.relationshipStatus;
+    const creatorRelationshipHasBlock =
+      creatorRelationship &&
+      relationshipBlockedInEitherDirection(creatorRelationship);
 
-    if (canCreateSidebars) {
+    if (canCreateSidebars && !creatorRelationshipHasBlock) {
       return ['sidebar'];
     }
     return [];
-  }, [item.threadInfo]);
+  }, [item.threadInfo, messageCreatorUserInfo.relationshipStatus]);
 
   const openRobotextTooltipModal = React.useCallback(
     (x, y, width, height, pageX, pageY) => {
       invariant(
         verticalBounds,
         'verticalBounds should be present in openRobotextTooltipModal',
       );
       const coordinates = { x: pageX, y: pageY, width, height };
 
       const messageTop = pageY;
       const messageBottom = pageY + height;
       const boundsTop = verticalBounds.y;
       const boundsBottom = verticalBounds.y + verticalBounds.height;
 
       const belowMargin = 20;
       const belowSpace = robotextMessageTooltipHeight + belowMargin;
       const { isViewer } = item.messageInfo.creator;
       const aboveMargin = isViewer ? 30 : 50;
       const aboveSpace = robotextMessageTooltipHeight + aboveMargin;
 
       let location = 'below',
         margin = 0;
       if (
         messageBottom + belowSpace > boundsBottom &&
         messageTop - aboveSpace > boundsTop
       ) {
         location = 'above';
         margin = aboveMargin;
       }
 
       props.navigation.navigate({
         name: RobotextMessageTooltipModalRouteName,
         params: {
           presentedFrom: props.route.key,
           initialCoordinates: coordinates,
           verticalBounds,
           visibleEntryIDs,
           location,
           margin,
           item,
           robotext,
         },
       });
     },
     [
       item,
       props.navigation,
       props.route.key,
       robotext,
       verticalBounds,
       visibleEntryIDs,
     ],
   );
 
   const onLongPress = React.useCallback(() => {
     if (visibleEntryIDs.length === 0) {
       return;
     }
     if (keyboardState && keyboardState.dismissKeyboardIfShowing()) {
       return;
     }
     if (!viewRef.current || !verticalBounds) {
       return;
     }
 
     if (!focused) {
       toggleFocus(messageKey(item.messageInfo));
     }
 
     invariant(overlayContext, 'RobotextMessage should have OverlayContext');
     overlayContext.setScrollBlockingModalStatus('open');
     viewRef.current?.measure(openRobotextTooltipModal);
   }, [
     focused,
     item,
     keyboardState,
     overlayContext,
     toggleFocus,
     verticalBounds,
     viewRef,
     visibleEntryIDs,
     openRobotextTooltipModal,
   ]);
 
   const onLayout = React.useCallback(() => {}, []);
 
   return (
     <View {...viewProps}>
       {timestamp}
       <View onLayout={onLayout} ref={viewRef}>
         <InnerRobotextMessage
           item={item}
           navigation={navigation}
           onPress={onPress}
           onLongPress={onLongPress}
         />
       </View>
     </View>
   );
 }
 
 export { robotextMessageItemHeight, RobotextMessage };
diff --git a/native/chat/text-message.react.js b/native/chat/text-message.react.js
index 3f8856892..2b55aa1e5 100644
--- a/native/chat/text-message.react.js
+++ b/native/chat/text-message.react.js
@@ -1,236 +1,252 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 import { View } from 'react-native';
+import { useSelector } from 'react-redux';
 
 import { messageKey } from 'lib/shared/message-utils';
+import { relationshipBlockedInEitherDirection } from 'lib/shared/relationship-utils';
 import { threadHasPermission } from 'lib/shared/thread-utils';
 import type { LocalMessageInfo } from 'lib/types/message-types';
 import type { TextMessageInfo } from 'lib/types/message/text';
 import { type ThreadInfo, threadPermissions } from 'lib/types/thread-types';
+import type { UserInfo } from 'lib/types/user-types';
 
 import {
   type KeyboardState,
   KeyboardContext,
 } from '../keyboard/keyboard-state';
 import { MarkdownLinkContext } from '../markdown/markdown-link-context';
 import {
   OverlayContext,
   type OverlayContextType,
 } from '../navigation/overlay-context';
 import type { NavigationRoute } from '../navigation/route-names';
 import { TextMessageTooltipModalRouteName } from '../navigation/route-names';
 import type { VerticalBounds } from '../types/layout-types';
 import type { ChatNavigationProp } from './chat.react';
 import { ComposedMessage, clusterEndHeight } from './composed-message.react';
 import { failedSendHeight } from './failed-send.react';
 import { InnerTextMessage } from './inner-text-message.react';
 import { authorNameHeight } from './message-header.react';
 import textMessageSendFailed from './text-message-send-failed';
 import { textMessageTooltipHeight } from './text-message-tooltip-modal.react';
 
 export type ChatTextMessageInfoItemWithHeight = {|
   itemType: 'message',
   messageShapeType: 'text',
   messageInfo: TextMessageInfo,
   localMessageInfo: ?LocalMessageInfo,
   threadInfo: ThreadInfo,
   startsConversation: boolean,
   startsCluster: boolean,
   endsCluster: boolean,
   contentHeight: number,
 |};
 
 function textMessageItemHeight(item: ChatTextMessageInfoItemWithHeight) {
   const { messageInfo, contentHeight, startsCluster, endsCluster } = item;
   const { isViewer } = messageInfo.creator;
   let height = 5 + contentHeight; // 5 from marginBottom in ComposedMessage
   if (!isViewer && startsCluster) {
     height += authorNameHeight;
   }
   if (endsCluster) {
     height += clusterEndHeight;
   }
   if (textMessageSendFailed(item)) {
     height += failedSendHeight;
   }
   return height;
 }
 
 type BaseProps = {|
   ...React.ElementConfig<typeof View>,
   +item: ChatTextMessageInfoItemWithHeight,
   +navigation: ChatNavigationProp<'MessageList'>,
   +route: NavigationRoute<'MessageList'>,
   +focused: boolean,
   +toggleFocus: (messageKey: string) => void,
   +verticalBounds: ?VerticalBounds,
 |};
 type Props = {|
   ...BaseProps,
+  // Redux state
+  +messageCreatorUserInfo: UserInfo,
   // withKeyboardState
   +keyboardState: ?KeyboardState,
   // withOverlayContext
   +overlayContext: ?OverlayContextType,
   // MarkdownLinkContext
   +linkPressActive: boolean,
 |};
 class TextMessage extends React.PureComponent<Props> {
   message: ?React.ElementRef<typeof View>;
 
   render() {
     const {
       item,
       navigation,
       route,
       focused,
       toggleFocus,
       verticalBounds,
       keyboardState,
       overlayContext,
       linkPressActive,
+      messageCreatorUserInfo,
       ...viewProps
     } = this.props;
     const canSwipe = threadHasPermission(
       item.threadInfo,
       threadPermissions.VOICED,
     );
     return (
       <ComposedMessage
         item={item}
         sendFailed={textMessageSendFailed(item)}
         focused={focused}
         canSwipe={canSwipe}
         {...viewProps}
       >
         <InnerTextMessage
           item={item}
           onPress={this.onPress}
           messageRef={this.messageRef}
         />
       </ComposedMessage>
     );
   }
 
   messageRef = (message: ?React.ElementRef<typeof View>) => {
     this.message = message;
   };
 
   visibleEntryIDs() {
     const result = ['copy'];
 
     const canReply = threadHasPermission(
       this.props.item.threadInfo,
       threadPermissions.VOICED,
     );
     const canCreateSidebars = threadHasPermission(
       this.props.item.threadInfo,
       threadPermissions.CREATE_SIDEBARS,
     );
 
+    const creatorRelationship = this.props.messageCreatorUserInfo
+      .relationshipStatus;
+    const creatorRelationshipHasBlock =
+      creatorRelationship &&
+      relationshipBlockedInEitherDirection(creatorRelationship);
+
     if (canReply) {
       result.push('reply');
     }
 
-    if (canCreateSidebars) {
+    if (canCreateSidebars && !creatorRelationshipHasBlock) {
       result.push('sidebar');
     }
 
     return result;
   }
 
   onPress = () => {
     if (this.dismissKeyboardIfShowing()) {
       return;
     }
 
     const {
       message,
       props: { verticalBounds, linkPressActive },
     } = this;
     if (!message || !verticalBounds || linkPressActive) {
       return;
     }
 
     const { focused, toggleFocus, item } = this.props;
     if (!focused) {
       toggleFocus(messageKey(item.messageInfo));
     }
 
     const { overlayContext } = this.props;
     invariant(overlayContext, 'TextMessage should have OverlayContext');
     overlayContext.setScrollBlockingModalStatus('open');
 
     message.measure((x, y, width, height, pageX, pageY) => {
       const coordinates = { x: pageX, y: pageY, width, height };
 
       const messageTop = pageY;
       const messageBottom = pageY + height;
       const boundsTop = verticalBounds.y;
       const boundsBottom = verticalBounds.y + verticalBounds.height;
 
       const belowMargin = 20;
       const belowSpace = textMessageTooltipHeight + belowMargin;
       const { isViewer } = item.messageInfo.creator;
       const aboveMargin = isViewer ? 30 : 50;
       const aboveSpace = textMessageTooltipHeight + aboveMargin;
 
       let location = 'below',
         margin = belowMargin;
       if (
         messageBottom + belowSpace > boundsBottom &&
         messageTop - aboveSpace > boundsTop
       ) {
         location = 'above';
         margin = aboveMargin;
       }
 
       this.props.navigation.navigate({
         name: TextMessageTooltipModalRouteName,
         params: {
           presentedFrom: this.props.route.key,
           initialCoordinates: coordinates,
           verticalBounds,
           visibleEntryIDs: this.visibleEntryIDs(),
           location,
           margin,
           item,
         },
       });
     });
   };
 
   dismissKeyboardIfShowing = () => {
     const { keyboardState } = this.props;
     return !!(keyboardState && keyboardState.dismissKeyboardIfShowing());
   };
 }
 
 const ConnectedTextMessage = React.memo<BaseProps>(
   function ConnectedTextMessage(props: BaseProps) {
     const keyboardState = React.useContext(KeyboardContext);
     const overlayContext = React.useContext(OverlayContext);
 
     const [linkPressActive, setLinkPressActive] = React.useState(false);
     const markdownLinkContext = React.useMemo(
       () => ({
         setLinkPressActive,
       }),
       [setLinkPressActive],
     );
+    const messageCreatorUserInfo = useSelector(
+      (state) => state.userStore.userInfos[props.item.messageInfo.creator.id],
+    );
 
     return (
       <MarkdownLinkContext.Provider value={markdownLinkContext}>
         <TextMessage
           {...props}
+          messageCreatorUserInfo={messageCreatorUserInfo}
           overlayContext={overlayContext}
           keyboardState={keyboardState}
           linkPressActive={linkPressActive}
         />
       </MarkdownLinkContext.Provider>
     );
   },
 );
 
 export { ConnectedTextMessage as TextMessage, textMessageItemHeight };