diff --git a/web/utils/tooltip-action-utils.js b/web/utils/tooltip-action-utils.js
index ed32a73f8..dd7953f76 100644
--- a/web/utils/tooltip-action-utils.js
+++ b/web/utils/tooltip-action-utils.js
@@ -1,506 +1,487 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 
 import { useModalContext } from 'lib/components/modal-provider.react.js';
 import { useResettingState } from 'lib/hooks/use-resetting-state.js';
 import type {
   ReactionInfo,
   ChatMessageInfoItem,
 } from 'lib/selectors/chat-selectors.js';
 import { useCanEditMessage } from 'lib/shared/edit-messages-utils.js';
 import { createMessageReply } from 'lib/shared/message-utils.js';
 import { useCanCreateReactionFromMessage } from 'lib/shared/reaction-utils.js';
 import {
   threadHasPermission,
   useSidebarExistsOrCanBeCreated,
 } from 'lib/shared/thread-utils.js';
 import { messageTypes } from 'lib/types/message-types-enum.js';
 import { isComposableMessageType } from 'lib/types/message-types.js';
 import { threadPermissions } from 'lib/types/thread-permission-types.js';
 import type { ThreadInfo } from 'lib/types/thread-types.js';
 import { longAbsoluteDate } from 'lib/utils/date-utils.js';
 
 import {
   type MessageTooltipAction,
   getTooltipPositionStyle,
   calculateMessageTooltipSize,
   calculateReactionTooltipSize,
   type TooltipPosition,
   type TooltipPositionStyle,
   type TooltipSize,
 } from './tooltip-utils.js';
 import { getComposedMessageID } from '../chat/chat-constants.js';
 import { useEditModalContext } from '../chat/edit-message-provider.js';
 import MessageTooltip from '../chat/message-tooltip.react.js';
 import ReactionTooltip from '../chat/reaction-tooltip.react.js';
 import { useTooltipContext } from '../chat/tooltip-provider.js';
 import CommIcon from '../CommIcon.react.js';
 import { InputStateContext } from '../input/input-state.js';
 import TogglePinModal from '../modals/chat/toggle-pin-modal.react.js';
 import {
   useOnClickPendingSidebar,
   useOnClickThread,
 } from '../selectors/thread-selectors.js';
 
 type UseTooltipArgs = {
   +createTooltip: (tooltipPositionStyle: TooltipPositionStyle) => React.Node,
   +tooltipSize: TooltipSize,
   +availablePositions: $ReadOnlyArray<TooltipPosition>,
-  +preventDisplayingBelowSource?: boolean,
 };
 type UseTooltipResult = {
   +onMouseEnter: (event: SyntheticEvent<HTMLElement>) => mixed,
   +onMouseLeave: ?() => mixed,
 };
 
 function useTooltip({
   createTooltip,
   tooltipSize,
   availablePositions,
-  preventDisplayingBelowSource,
 }: UseTooltipArgs): UseTooltipResult {
   const [onMouseLeave, setOnMouseLeave] = React.useState<?() => mixed>(null);
   const [tooltipSourcePosition, setTooltipSourcePosition] = React.useState();
 
   const { renderTooltip } = useTooltipContext();
   const updateTooltip = React.useRef();
 
   const onMouseEnter = React.useCallback(
     (event: SyntheticEvent<HTMLElement>) => {
       if (!renderTooltip) {
         return;
       }
       const rect = event.currentTarget.getBoundingClientRect();
       const { top, bottom, left, right, height, width } = rect;
       const sourcePosition = { top, bottom, left, right, height, width };
       setTooltipSourcePosition(sourcePosition);
 
       const tooltipPositionStyle = getTooltipPositionStyle({
         tooltipSourcePosition: sourcePosition,
         tooltipSize,
         availablePositions,
-        preventDisplayingBelowSource,
       });
       if (!tooltipPositionStyle) {
         return;
       }
 
       const tooltip = createTooltip(tooltipPositionStyle);
 
       const renderTooltipResult = renderTooltip({
         newNode: tooltip,
         tooltipPositionStyle,
       });
       if (renderTooltipResult) {
         const { onMouseLeaveCallback: callback } = renderTooltipResult;
         setOnMouseLeave((() => callback: () => () => mixed));
         updateTooltip.current = renderTooltipResult.updateTooltip;
       }
     },
-    [
-      availablePositions,
-      createTooltip,
-      preventDisplayingBelowSource,
-      renderTooltip,
-      tooltipSize,
-    ],
+    [availablePositions, createTooltip, renderTooltip, tooltipSize],
   );
 
   React.useEffect(() => {
     if (!updateTooltip.current) {
       return;
     }
 
     const tooltipPositionStyle = getTooltipPositionStyle({
       tooltipSourcePosition,
       tooltipSize,
       availablePositions,
-      preventDisplayingBelowSource,
     });
     if (!tooltipPositionStyle) {
       return;
     }
 
     const tooltip = createTooltip(tooltipPositionStyle);
     updateTooltip.current?.(tooltip);
-  }, [
-    availablePositions,
-    createTooltip,
-    preventDisplayingBelowSource,
-    tooltipSize,
-    tooltipSourcePosition,
-  ]);
+  }, [availablePositions, createTooltip, tooltipSize, tooltipSourcePosition]);
 
   return {
     onMouseEnter,
     onMouseLeave,
   };
 }
 
 function useMessageTooltipSidebarAction(
   item: ChatMessageInfoItem,
   threadInfo: ThreadInfo,
 ): ?MessageTooltipAction {
   const { threadCreatedFromMessage, messageInfo } = item;
   const { popModal } = useModalContext();
   const sidebarExists = !!threadCreatedFromMessage;
   const sidebarExistsOrCanBeCreated = useSidebarExistsOrCanBeCreated(
     threadInfo,
     item,
   );
   const openThread = useOnClickThread(threadCreatedFromMessage);
   const openPendingSidebar = useOnClickPendingSidebar(messageInfo, threadInfo);
   return React.useMemo(() => {
     if (!sidebarExistsOrCanBeCreated) {
       return null;
     }
     const buttonContent = <CommIcon icon="sidebar-filled" size={16} />;
     const onClick = (event: SyntheticEvent<HTMLElement>) => {
       popModal();
 
       if (threadCreatedFromMessage) {
         openThread(event);
       } else {
         openPendingSidebar(event);
       }
     };
     return {
       actionButtonContent: buttonContent,
       onClick,
       label: sidebarExists ? 'Go to thread' : 'Create thread',
     };
   }, [
     popModal,
     openPendingSidebar,
     openThread,
     sidebarExists,
     sidebarExistsOrCanBeCreated,
     threadCreatedFromMessage,
   ]);
 }
 
 function useMessageTooltipReplyAction(
   item: ChatMessageInfoItem,
   threadInfo: ThreadInfo,
 ): ?MessageTooltipAction {
   const { messageInfo } = item;
   const { popModal } = useModalContext();
   const inputState = React.useContext(InputStateContext);
   invariant(inputState, 'inputState is required');
   const { addReply } = inputState;
   return React.useMemo(() => {
     if (
       item.messageInfo.type !== messageTypes.TEXT ||
       !threadHasPermission(threadInfo, threadPermissions.VOICED)
     ) {
       return null;
     }
     const buttonContent = <CommIcon icon="reply-filled" size={18} />;
     const onClick = () => {
       popModal();
 
       if (!messageInfo.text) {
         return;
       }
       addReply(createMessageReply(messageInfo.text));
     };
     return {
       actionButtonContent: buttonContent,
       onClick,
       label: 'Reply',
     };
   }, [popModal, addReply, item.messageInfo.type, messageInfo, threadInfo]);
 }
 
 const copiedMessageDurationMs = 2000;
 function useMessageCopyAction(
   item: ChatMessageInfoItem,
 ): ?MessageTooltipAction {
   const { messageInfo } = item;
 
   const [successful, setSuccessful] = useResettingState(
     false,
     copiedMessageDurationMs,
   );
 
   return React.useMemo(() => {
     if (messageInfo.type !== messageTypes.TEXT) {
       return null;
     }
     const buttonContent = <CommIcon icon="copy-filled" size={18} />;
     const onClick = async () => {
       try {
         await navigator.clipboard.writeText(messageInfo.text);
         setSuccessful(true);
       } catch (e) {
         setSuccessful(false);
       }
     };
     return {
       actionButtonContent: buttonContent,
       onClick,
       label: successful ? 'Copied!' : 'Copy',
     };
   }, [messageInfo.text, messageInfo.type, setSuccessful, successful]);
 }
 
 function useMessageReactAction(
   item: ChatMessageInfoItem,
   threadInfo: ThreadInfo,
 ): ?MessageTooltipAction {
   const { messageInfo } = item;
 
   const { setShouldRenderEmojiKeyboard } = useTooltipContext();
 
   const canCreateReactionFromMessage = useCanCreateReactionFromMessage(
     threadInfo,
     messageInfo,
   );
 
   return React.useMemo(() => {
     if (!canCreateReactionFromMessage) {
       return null;
     }
 
     const buttonContent = <CommIcon icon="emote-smile-filled" size={18} />;
 
     const onClickReact = () => {
       if (!setShouldRenderEmojiKeyboard) {
         return;
       }
       setShouldRenderEmojiKeyboard(true);
     };
 
     return {
       actionButtonContent: buttonContent,
       onClick: onClickReact,
       label: 'React',
     };
   }, [canCreateReactionFromMessage, setShouldRenderEmojiKeyboard]);
 }
 
 function useMessageTogglePinAction(
   item: ChatMessageInfoItem,
   threadInfo: ThreadInfo,
 ): ?MessageTooltipAction {
   const { pushModal } = useModalContext();
   const { messageInfo, isPinned } = item;
 
   const canTogglePin =
     isComposableMessageType(messageInfo.type) &&
     threadHasPermission(threadInfo, threadPermissions.MANAGE_PINS);
 
   const inputState = React.useContext(InputStateContext);
 
   return React.useMemo(() => {
     if (!canTogglePin) {
       return null;
     }
 
     const iconName = isPinned ? 'unpin' : 'pin';
 
     const buttonContent = <CommIcon icon={iconName} size={18} />;
 
     const onClickTogglePin = () => {
       pushModal(
         <InputStateContext.Provider value={inputState}>
           <TogglePinModal item={item} threadInfo={threadInfo} />
         </InputStateContext.Provider>,
       );
     };
 
     return {
       actionButtonContent: buttonContent,
       onClick: onClickTogglePin,
       label: isPinned ? 'Unpin' : 'Pin',
     };
   }, [canTogglePin, inputState, isPinned, pushModal, item, threadInfo]);
 }
 
 function useMessageEditAction(
   item: ChatMessageInfoItem,
   threadInfo: ThreadInfo,
 ): ?MessageTooltipAction {
   const { messageInfo } = item;
 
   const canEditMessage = useCanEditMessage(threadInfo, messageInfo);
   const { renderEditModal, scrollToMessage } = useEditModalContext();
   const { clearTooltip } = useTooltipContext();
 
   return React.useMemo(() => {
     if (!canEditMessage) {
       return null;
     }
     const buttonContent = <CommIcon icon="edit-filled" size={18} />;
     const onClickEdit = () => {
       const callback = (maxHeight: number) =>
         renderEditModal({
           messageInfo: item,
           threadInfo,
           isError: false,
           editedMessageDraft: messageInfo.text,
           maxHeight: maxHeight,
         });
       clearTooltip();
       scrollToMessage(getComposedMessageID(messageInfo), callback);
     };
     return {
       actionButtonContent: buttonContent,
       onClick: onClickEdit,
       label: 'Edit',
     };
   }, [
     canEditMessage,
     clearTooltip,
     item,
     messageInfo,
     renderEditModal,
     scrollToMessage,
     threadInfo,
   ]);
 }
 
 function useMessageTooltipActions(
   item: ChatMessageInfoItem,
   threadInfo: ThreadInfo,
 ): $ReadOnlyArray<MessageTooltipAction> {
   const sidebarAction = useMessageTooltipSidebarAction(item, threadInfo);
   const replyAction = useMessageTooltipReplyAction(item, threadInfo);
   const copyAction = useMessageCopyAction(item);
   const reactAction = useMessageReactAction(item, threadInfo);
   const togglePinAction = useMessageTogglePinAction(item, threadInfo);
   const editAction = useMessageEditAction(item, threadInfo);
   return React.useMemo(
     () =>
       [
         replyAction,
         sidebarAction,
         copyAction,
         reactAction,
         togglePinAction,
         editAction,
       ].filter(Boolean),
     [
       replyAction,
       sidebarAction,
       copyAction,
       reactAction,
       togglePinAction,
       editAction,
     ],
   );
 }
 
 const undefinedTooltipSize = {
   width: 0,
   height: 0,
 };
 
 type UseMessageTooltipArgs = {
   +availablePositions: $ReadOnlyArray<TooltipPosition>,
   +item: ChatMessageInfoItem,
   +threadInfo: ThreadInfo,
 };
 
 function useMessageTooltip({
   availablePositions,
   item,
   threadInfo,
 }: UseMessageTooltipArgs): UseTooltipResult {
   const tooltipActions = useMessageTooltipActions(item, threadInfo);
 
-  const containsInlineEngagement = !!item.threadCreatedFromMessage;
-
   const messageTimestamp = React.useMemo(() => {
     const time = item.messageInfo.time;
     return longAbsoluteDate(time);
   }, [item.messageInfo.time]);
 
   const tooltipSize = React.useMemo(() => {
     if (typeof document === 'undefined') {
       return undefinedTooltipSize;
     }
     const tooltipLabels = tooltipActions.map(action => action.label);
     return calculateMessageTooltipSize({
       tooltipLabels,
       timestamp: messageTimestamp,
     });
   }, [messageTimestamp, tooltipActions]);
 
   const createMessageTooltip = React.useCallback(
     tooltipPositionStyle => (
       <MessageTooltip
         actions={tooltipActions}
         messageTimestamp={messageTimestamp}
         tooltipPositionStyle={tooltipPositionStyle}
         tooltipSize={tooltipSize}
         item={item}
         threadInfo={threadInfo}
       />
     ),
     [item, messageTimestamp, threadInfo, tooltipActions, tooltipSize],
   );
 
   const { onMouseEnter, onMouseLeave } = useTooltip({
     createTooltip: createMessageTooltip,
     tooltipSize,
     availablePositions,
-    preventDisplayingBelowSource: containsInlineEngagement,
   });
 
   return {
     onMouseEnter,
     onMouseLeave,
   };
 }
 
 type UseReactionTooltipArgs = {
   +reaction: string,
   +reactions: ReactionInfo,
   +availablePositions: $ReadOnlyArray<TooltipPosition>,
 };
 
 function useReactionTooltip({
   reaction,
   reactions,
   availablePositions,
 }: UseReactionTooltipArgs): UseTooltipResult {
   const { users } = reactions[reaction];
 
   const tooltipSize = React.useMemo(() => {
     if (typeof document === 'undefined') {
       return undefinedTooltipSize;
     }
 
     const usernames = users.map(user => user.username).filter(Boolean);
 
     return calculateReactionTooltipSize(usernames);
   }, [users]);
 
   const createReactionTooltip = React.useCallback(
     () => <ReactionTooltip reactions={reactions} reaction={reaction} />,
     [reaction, reactions],
   );
 
   const { onMouseEnter, onMouseLeave } = useTooltip({
     createTooltip: createReactionTooltip,
     tooltipSize,
     availablePositions,
   });
 
   return {
     onMouseEnter,
     onMouseLeave,
   };
 }
 
 export {
   useMessageTooltipSidebarAction,
   useMessageTooltipReplyAction,
   useMessageReactAction,
   useMessageTooltipActions,
   useMessageTooltip,
   useReactionTooltip,
 };
diff --git a/web/utils/tooltip-utils.js b/web/utils/tooltip-utils.js
index b8aeeac99..a2eb466ff 100644
--- a/web/utils/tooltip-utils.js
+++ b/web/utils/tooltip-utils.js
@@ -1,435 +1,415 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 
 import { getAppContainerPositionInfo } from './window-utils.js';
 import {
   tooltipButtonStyle,
   tooltipLabelStyle,
   tooltipStyle,
   reactionTooltipStyle,
   reactionSeeMoreLabel,
 } from '../chat/chat-constants.js';
 import type { PositionInfo } from '../chat/position-types.js';
 import { calculateMaxTextWidth } from '../utils/text-utils.js';
 
 export const tooltipPositions = Object.freeze({
   LEFT: 'left',
   RIGHT: 'right',
   LEFT_BOTTOM: 'left-bottom',
   RIGHT_BOTTOM: 'right-bottom',
   LEFT_TOP: 'left-top',
   RIGHT_TOP: 'right-top',
   TOP: 'top',
   BOTTOM: 'bottom',
 });
 
 export type TooltipSize = {
   +height: number,
   +width: number,
 };
 
 export type TooltipPositionStyle = {
   +anchorPoint: {
     +x: number,
     +y: number,
   },
   +verticalPosition: 'top' | 'bottom',
   +horizontalPosition: 'left' | 'right',
   +alignment: 'left' | 'center' | 'right',
 };
 
 export type TooltipPosition = $Values<typeof tooltipPositions>;
 
 export type MessageTooltipAction = {
   +label: string,
   +onClick: (SyntheticEvent<HTMLDivElement>) => mixed,
   +actionButtonContent: React.Node,
 };
 
 function getTooltipScreenOverflowRightCorrection(
   xAnchor: number,
   tooltipWidth: number,
 ): number {
   const appContainerPositionInfo = getAppContainerPositionInfo();
   if (!appContainerPositionInfo) {
     return 0;
   }
 
   const { right: containerRight } = appContainerPositionInfo;
   const padding = 8;
 
   const tooltipRightEdge = xAnchor + tooltipWidth;
   const screenRightOverflow = tooltipRightEdge - containerRight;
 
   if (screenRightOverflow <= 0) {
     return 0;
   }
 
   return screenRightOverflow + padding;
 }
 
 type FindTooltipPositionArgs = {
   +sourcePositionInfo: PositionInfo,
   +tooltipSize: TooltipSize,
   +availablePositions: $ReadOnlyArray<TooltipPosition>,
   +defaultPosition: TooltipPosition,
-  +preventDisplayingBelowSource?: boolean,
 };
 
 function findTooltipPosition({
   sourcePositionInfo,
   tooltipSize,
   availablePositions,
   defaultPosition,
-  preventDisplayingBelowSource,
 }: FindTooltipPositionArgs): TooltipPosition {
   const appContainerPositionInfo = getAppContainerPositionInfo();
 
   if (!appContainerPositionInfo) {
     return defaultPosition;
   }
 
   const pointingTo = sourcePositionInfo;
   const {
     top: containerTop,
     left: containerLeft,
     right: containerRight,
     bottom: containerBottom,
   } = appContainerPositionInfo;
 
   const tooltipWidth = tooltipSize.width;
   const tooltipHeight = tooltipSize.height;
 
   const canBeDisplayedOnLeft = containerLeft + tooltipWidth <= pointingTo.left;
   const canBeDisplayedOnRight =
     tooltipWidth + pointingTo.right <= containerRight;
 
-  const willCoverSidebarOnTopSideways =
-    preventDisplayingBelowSource &&
-    pointingTo.top + tooltipHeight > pointingTo.bottom;
-
   const canBeDisplayedOnTopSideways =
     pointingTo.top >= containerTop &&
-    pointingTo.top + tooltipHeight <= containerBottom &&
-    !willCoverSidebarOnTopSideways;
+    pointingTo.top + tooltipHeight <= containerBottom;
 
   const canBeDisplayedOnBottomSideways =
     pointingTo.bottom <= containerBottom &&
     pointingTo.bottom - tooltipHeight >= containerTop;
 
   const verticalCenterOfPointingTo = pointingTo.top + pointingTo.height / 2;
   const horizontalCenterOfPointingTo = pointingTo.left + pointingTo.width / 2;
 
-  const willCoverSidebarInTheMiddleSideways =
-    preventDisplayingBelowSource &&
-    verticalCenterOfPointingTo + tooltipHeight / 2 > pointingTo.bottom;
-
   const canBeDisplayedInTheMiddleSideways =
     verticalCenterOfPointingTo - tooltipHeight / 2 >= containerTop &&
-    verticalCenterOfPointingTo + tooltipHeight / 2 <= containerBottom &&
-    !willCoverSidebarInTheMiddleSideways;
+    verticalCenterOfPointingTo + tooltipHeight / 2 <= containerBottom;
 
   const canBeDisplayedOnTop =
     pointingTo.top - tooltipHeight >= containerTop &&
     horizontalCenterOfPointingTo - tooltipWidth / 2 >= containerLeft &&
     horizontalCenterOfPointingTo + tooltipWidth / 2 <= containerRight;
 
   const canBeDisplayedOnBottom =
     pointingTo.bottom + tooltipHeight <= containerBottom &&
     horizontalCenterOfPointingTo - tooltipWidth / 2 >= containerLeft &&
-    horizontalCenterOfPointingTo + tooltipWidth / 2 <= containerRight &&
-    !preventDisplayingBelowSource;
+    horizontalCenterOfPointingTo + tooltipWidth / 2 <= containerRight;
 
   for (const tooltipPosition of availablePositions) {
     if (
       tooltipPosition === tooltipPositions.RIGHT &&
       canBeDisplayedOnRight &&
       canBeDisplayedInTheMiddleSideways
     ) {
       return tooltipPosition;
     } else if (
       tooltipPosition === tooltipPositions.RIGHT_BOTTOM &&
       canBeDisplayedOnRight &&
       canBeDisplayedOnBottomSideways
     ) {
       return tooltipPosition;
     } else if (
       tooltipPosition === tooltipPositions.LEFT &&
       canBeDisplayedOnLeft &&
       canBeDisplayedInTheMiddleSideways
     ) {
       return tooltipPosition;
     } else if (
       tooltipPosition === tooltipPositions.LEFT_BOTTOM &&
       canBeDisplayedOnLeft &&
       canBeDisplayedOnBottomSideways
     ) {
       return tooltipPosition;
     } else if (
       tooltipPosition === tooltipPositions.LEFT_TOP &&
       canBeDisplayedOnLeft &&
       canBeDisplayedOnTopSideways
     ) {
       return tooltipPosition;
     } else if (
       tooltipPosition === tooltipPositions.RIGHT_TOP &&
       canBeDisplayedOnRight &&
       canBeDisplayedOnTopSideways
     ) {
       return tooltipPosition;
     } else if (
       tooltipPosition === tooltipPositions.TOP &&
       canBeDisplayedOnTop
     ) {
       return tooltipPosition;
     } else if (
       tooltipPosition === tooltipPositions.BOTTOM &&
       canBeDisplayedOnBottom
     ) {
       return tooltipPosition;
     }
   }
   return defaultPosition;
 }
 
 type GetTooltipStyleParams = {
   +sourcePositionInfo: PositionInfo,
   +tooltipSize: TooltipSize,
   +tooltipPosition: TooltipPosition,
 };
 
 // ESLint doesn't recognize that invariant always throws
 // eslint-disable-next-line consistent-return
 function getTooltipStyle({
   sourcePositionInfo,
   tooltipSize,
   tooltipPosition,
 }: GetTooltipStyleParams): TooltipPositionStyle {
   if (tooltipPosition === tooltipPositions.RIGHT_TOP) {
     return {
       anchorPoint: {
         x: sourcePositionInfo.right,
         y: sourcePositionInfo.top,
       },
       horizontalPosition: 'right',
       verticalPosition: 'bottom',
       alignment: 'left',
     };
   } else if (tooltipPosition === tooltipPositions.LEFT_TOP) {
     return {
       anchorPoint: {
         x: sourcePositionInfo.left,
         y: sourcePositionInfo.top,
       },
       horizontalPosition: 'left',
       verticalPosition: 'bottom',
       alignment: 'right',
     };
   } else if (tooltipPosition === tooltipPositions.RIGHT_BOTTOM) {
     return {
       anchorPoint: {
         x: sourcePositionInfo.right,
         y: sourcePositionInfo.bottom,
       },
       horizontalPosition: 'right',
       verticalPosition: 'top',
       alignment: 'left',
     };
   } else if (tooltipPosition === tooltipPositions.LEFT_BOTTOM) {
     return {
       anchorPoint: {
         x: sourcePositionInfo.left,
         y: sourcePositionInfo.bottom,
       },
       horizontalPosition: 'left',
       verticalPosition: 'top',
       alignment: 'right',
     };
   } else if (tooltipPosition === tooltipPositions.LEFT) {
     return {
       anchorPoint: {
         x: sourcePositionInfo.left,
         y:
           sourcePositionInfo.top +
           sourcePositionInfo.height / 2 -
           tooltipSize.height / 2,
       },
       horizontalPosition: 'left',
       verticalPosition: 'bottom',
       alignment: 'right',
     };
   } else if (tooltipPosition === tooltipPositions.RIGHT) {
     return {
       anchorPoint: {
         x: sourcePositionInfo.right,
         y:
           sourcePositionInfo.top +
           sourcePositionInfo.height / 2 -
           tooltipSize.height / 2,
       },
       horizontalPosition: 'right',
       verticalPosition: 'bottom',
       alignment: 'left',
     };
   } else if (tooltipPosition === tooltipPositions.TOP) {
     const xAnchor =
       sourcePositionInfo.left +
       sourcePositionInfo.width / 2 -
       tooltipSize.width / 2;
 
     const tooltipOverflowRightCorrection =
       getTooltipScreenOverflowRightCorrection(xAnchor, tooltipSize.width);
 
     return {
       anchorPoint: {
         x: xAnchor - tooltipOverflowRightCorrection,
         y: sourcePositionInfo.top,
       },
       horizontalPosition: 'right',
       verticalPosition: 'top',
       alignment: 'center',
     };
   } else if (tooltipPosition === tooltipPositions.BOTTOM) {
     const xAnchor =
       sourcePositionInfo.left +
       sourcePositionInfo.width / 2 -
       tooltipSize.width / 2;
 
     const tooltipOverflowRightCorrection =
       getTooltipScreenOverflowRightCorrection(xAnchor, tooltipSize.width);
 
     return {
       anchorPoint: {
         x: xAnchor - tooltipOverflowRightCorrection,
         y: sourcePositionInfo.bottom,
       },
       horizontalPosition: 'right',
       verticalPosition: 'bottom',
       alignment: 'center',
     };
   }
   invariant(false, `Unexpected tooltip position value: ${tooltipPosition}`);
 }
 
 type GetTooltipPositionStyleParams = {
   +tooltipSourcePosition: ?PositionInfo,
   +tooltipSize: TooltipSize,
   +availablePositions: $ReadOnlyArray<TooltipPosition>,
-  +preventDisplayingBelowSource?: boolean,
 };
 
 function getTooltipPositionStyle(
   params: GetTooltipPositionStyleParams,
 ): ?TooltipPositionStyle {
-  const {
-    tooltipSourcePosition,
-    tooltipSize,
-    availablePositions,
-    preventDisplayingBelowSource,
-  } = params;
+  const { tooltipSourcePosition, tooltipSize, availablePositions } = params;
   if (!tooltipSourcePosition) {
     return undefined;
   }
   const tooltipPosition = findTooltipPosition({
     sourcePositionInfo: tooltipSourcePosition,
     tooltipSize,
     availablePositions,
     defaultPosition: availablePositions[0],
-    preventDisplayingBelowSource,
   });
   if (!tooltipPosition) {
     return undefined;
   }
 
   const tooltipPositionStyle = getTooltipStyle({
     tooltipPosition,
     sourcePositionInfo: tooltipSourcePosition,
     tooltipSize,
   });
 
   return tooltipPositionStyle;
 }
 
 type CalculateMessageTooltipSizeArgs = {
   +tooltipLabels: $ReadOnlyArray<string>,
   +timestamp: string,
 };
 
 function calculateMessageTooltipSize({
   tooltipLabels,
   timestamp,
 }: CalculateMessageTooltipSizeArgs): TooltipSize {
   const textWidth =
     calculateMaxTextWidth([...tooltipLabels, timestamp], 14) +
     2 * tooltipLabelStyle.padding;
   const buttonsWidth =
     tooltipLabels.length *
     (tooltipButtonStyle.width +
       tooltipButtonStyle.paddingLeft +
       tooltipButtonStyle.paddingRight);
   const width =
     Math.max(textWidth, buttonsWidth) +
     tooltipStyle.paddingLeft +
     tooltipStyle.paddingRight;
   const height =
     (tooltipLabelStyle.height + 2 * tooltipLabelStyle.padding) * 2 +
     tooltipStyle.rowGap * 2 +
     tooltipButtonStyle.height;
   return {
     width,
     height,
   };
 }
 
 function calculateReactionTooltipSize(
   usernames: $ReadOnlyArray<string>,
 ): TooltipSize {
   const showMoreTextIsShown = usernames.length > 5;
   const {
     maxWidth,
     maxHeight,
     paddingLeft,
     paddingRight,
     paddingTop,
     paddingBottom,
     rowGap,
   } = reactionTooltipStyle;
 
   const maxTooltipContentWidth = maxWidth;
   const maxTooltipContentHeight = maxHeight;
 
   const usernamesTextWidth = calculateMaxTextWidth(usernames, 14);
   const seeMoreTextWidth = calculateMaxTextWidth([reactionSeeMoreLabel], 12);
 
   let textWidth = usernamesTextWidth;
   if (showMoreTextIsShown) {
     textWidth = Math.max(usernamesTextWidth, seeMoreTextWidth);
   }
 
   const width =
     Math.min(maxTooltipContentWidth, textWidth) + paddingLeft + paddingRight;
 
   let height =
     usernames.length * tooltipLabelStyle.height +
     (usernames.length - 1) * rowGap;
 
   if (showMoreTextIsShown) {
     height = maxTooltipContentHeight;
   }
 
   height += paddingTop + paddingBottom;
 
   return {
     width,
     height,
   };
 }
 
 export {
   findTooltipPosition,
   getTooltipPositionStyle,
   calculateMessageTooltipSize,
   calculateReactionTooltipSize,
 };
diff --git a/web/utils/tooltip-utils.test.js b/web/utils/tooltip-utils.test.js
index 931883144..b90c89fe9 100644
--- a/web/utils/tooltip-utils.test.js
+++ b/web/utils/tooltip-utils.test.js
@@ -1,204 +1,165 @@
 // @flow
 
 import { findTooltipPosition, tooltipPositions } from './tooltip-utils.js';
 import type { PositionInfo } from '../chat/position-types.js';
 
 const QHDWindow = {
   width: 2560,
   height: 1440,
 };
 
 const tooltipSourcePositionCenter: PositionInfo = {
   width: 200,
   height: 300,
   left: QHDWindow.width / 2 - 100,
   top: QHDWindow.height / 2 - 150,
   right: QHDWindow.width / 2 + 100,
   bottom: QHDWindow.height / 2 + 150,
 };
 
 const tooltipSourcePositionTopRight: PositionInfo = {
   width: 200,
   height: 300,
   left: QHDWindow.width - 200,
   top: 65, // app top bar height
   right: QHDWindow.width,
   bottom: 300 + 65, // tooltip height + app top bar height
 };
 
 const tooltipSourcePositionBottomLeft: PositionInfo = {
   width: 200,
   height: 300,
   left: 0,
   top: QHDWindow.height - 300,
   right: 200,
   bottom: QHDWindow.height,
 };
 
 const tooltipSizeSmall = {
   width: 100,
   height: 200,
 };
 
 const tooltipSizeBig = {
   width: 300,
   height: 500,
 };
 
 const allTooltipPositions = [
   tooltipPositions.LEFT,
   tooltipPositions.LEFT_TOP,
   tooltipPositions.LEFT_BOTTOM,
   tooltipPositions.RIGHT,
   tooltipPositions.RIGHT_TOP,
   tooltipPositions.RIGHT_BOTTOM,
   tooltipPositions.TOP,
   tooltipPositions.BOTTOM,
 ];
 
 const sidewaysTooltipPositions = [
   tooltipPositions.LEFT,
   tooltipPositions.LEFT_TOP,
   tooltipPositions.LEFT_BOTTOM,
   tooltipPositions.RIGHT,
   tooltipPositions.RIGHT_TOP,
   tooltipPositions.RIGHT_BOTTOM,
 ];
 
 const topAndBottomTooltipPositions = [
   tooltipPositions.TOP,
   tooltipPositions.BOTTOM,
 ];
 
 const onlyLeftTooltipPositions = [
   tooltipPositions.LEFT,
   tooltipPositions.LEFT_BOTTOM,
   tooltipPositions.LEFT_TOP,
 ];
 
 beforeAll(() => {
   window.innerWidth = QHDWindow.width;
   window.innerHeight = QHDWindow.height;
 });
 
 afterAll(() => {
   window.innerWidth = 1024;
   window.innerHeight = 768;
 });
 
 describe('findTooltipPosition', () => {
   it(
     'should return first position if there is enough space ' +
       'in every direction',
     () =>
       expect(
         findTooltipPosition({
           sourcePositionInfo: tooltipSourcePositionCenter,
           tooltipSize: tooltipSizeSmall,
           availablePositions: allTooltipPositions,
           defaultPosition: allTooltipPositions[0],
         }),
       ).toMatch(allTooltipPositions[0]),
   );
 
   it(
     'should return first non-left position ' +
       'if there is no space on the left',
     () =>
       expect(
         findTooltipPosition({
           sourcePositionInfo: tooltipSourcePositionBottomLeft,
           tooltipSize: tooltipSizeSmall,
           availablePositions: sidewaysTooltipPositions,
           defaultPosition: sidewaysTooltipPositions[0],
         }),
       ).toMatch(tooltipPositions.RIGHT),
   );
 
   it('should return bottom position if there is no space on the top ', () =>
     expect(
       findTooltipPosition({
         sourcePositionInfo: tooltipSourcePositionTopRight,
         tooltipSize: tooltipSizeSmall,
         availablePositions: topAndBottomTooltipPositions,
         defaultPosition: topAndBottomTooltipPositions[0],
       }),
     ).toMatch(tooltipPositions.BOTTOM));
 
   it(
     'should return top left position if the tooltip is higher than the ' +
       'source object and there is no enough space on the top',
     () =>
       expect(
         findTooltipPosition({
           sourcePositionInfo: tooltipSourcePositionTopRight,
           tooltipSize: tooltipSizeBig,
           availablePositions: onlyLeftTooltipPositions,
           defaultPosition: onlyLeftTooltipPositions[0],
         }),
       ).toMatch(tooltipPositions.LEFT_TOP),
   );
 
-  it(
-    'should return bottom position on left ' +
-      'to prevent covering element below source',
-    () =>
-      expect(
-        findTooltipPosition({
-          sourcePositionInfo: tooltipSourcePositionCenter,
-          tooltipSize: tooltipSizeBig,
-          availablePositions: onlyLeftTooltipPositions,
-          defaultPosition: onlyLeftTooltipPositions[0],
-          preventDisplayingBelowSource: true,
-        }),
-      ).toMatch(tooltipPositions.LEFT_BOTTOM),
-  );
-
-  it(
-    'should return first position ' +
-      'that does not cover element below source ',
-    () =>
-      expect(
-        findTooltipPosition({
-          sourcePositionInfo: tooltipSourcePositionCenter,
-          tooltipSize: tooltipSizeBig,
-          availablePositions: [
-            tooltipPositions.BOTTOM,
-            tooltipPositions.RIGHT,
-            tooltipPositions.RIGHT_TOP,
-            tooltipPositions.LEFT,
-            tooltipPositions.LEFT_TOP,
-            tooltipPositions.TOP,
-            tooltipPositions.LEFT_BOTTOM,
-          ],
-          defaultPosition: tooltipPositions.BOTTOM,
-          preventDisplayingBelowSource: true,
-        }),
-      ).toMatch(tooltipPositions.TOP),
-  );
-
   it(
     'should return default position ' +
       'if an empty array of available is provided',
     () =>
       expect(
         findTooltipPosition({
           sourcePositionInfo: tooltipSourcePositionCenter,
           tooltipSize: tooltipSizeSmall,
           availablePositions: [],
           defaultPosition: tooltipPositions.LEFT_BOTTOM,
         }),
       ).toMatch(tooltipPositions.LEFT_BOTTOM),
   );
 
-  it('should return default position if an no position is available', () =>
+  it('should return default position if no position is available', () =>
     expect(
       findTooltipPosition({
-        sourcePositionInfo: tooltipSourcePositionTopRight,
+        sourcePositionInfo: tooltipSourcePositionBottomLeft,
         tooltipSize: tooltipSizeBig,
         availablePositions: allTooltipPositions,
         defaultPosition: tooltipPositions.BOTTOM,
-        preventDisplayingBelowSource: true,
       }),
     ).toMatch(tooltipPositions.BOTTOM));
 });