diff --git a/ts/components/conversation/header/ConversationHeader.tsx b/ts/components/conversation/header/ConversationHeader.tsx
index b8ccef618..93c8406f7 100644
--- a/ts/components/conversation/header/ConversationHeader.tsx
+++ b/ts/components/conversation/header/ConversationHeader.tsx
@@ -1,23 +1,18 @@
 import React from 'react';
 
 import { useDispatch, useSelector } from 'react-redux';
-import {
-  isMessageDetailView,
-  isMessageSelectionMode,
-} from '../../../state/selectors/conversations';
+import { isMessageSelectionMode } from '../../../state/selectors/conversations';
 
-import { closeMessageDetailsView, openRightPanel } from '../../../state/ducks/conversations';
+import { openRightPanel } from '../../../state/ducks/conversations';
 
 import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
 import { Flex } from '../../basic/Flex';
-import { AvatarHeader, BackButton, CallButton } from './ConversationHeaderItems';
+import { AvatarHeader, CallButton } from './ConversationHeaderItems';
 import { SelectionOverlay } from './ConversationHeaderSelectionOverlay';
 import { ConversationHeaderTitle } from './ConversationHeaderTitle';
 
 export const ConversationHeaderWithDetails = () => {
   const isSelectionMode = useSelector(isMessageSelectionMode);
-  // TODO remove I think?
-  const isMessageDetailOpened = useSelector(isMessageDetailView);
   const selectedConvoKey = useSelectedConversationKey();
   const dispatch = useDispatch();
 
@@ -29,18 +24,11 @@ export const ConversationHeaderWithDetails = () => {
     <div className="module-conversation-header">
       <Flex
         container={true}
-        justifyContent={isMessageDetailOpened ? 'space-between' : 'flex-end'}
+        justifyContent={'flex-end'}
         alignItems="center"
         width="100%"
         flexGrow={1}
       >
-        {/* TODO do we remove */}
-        <BackButton
-          onGoBack={() => {
-            dispatch(closeMessageDetailsView());
-          }}
-          showBackButton={isMessageDetailOpened}
-        />
         <ConversationHeaderTitle />
 
         {!isSelectionMode && (
@@ -57,7 +45,6 @@ export const ConversationHeaderWithDetails = () => {
                 dispatch(openRightPanel());
               }}
               pubkey={selectedConvoKey}
-              showBackButton={isMessageDetailOpened}
             />
           </Flex>
         )}
diff --git a/ts/components/conversation/header/ConversationHeaderItems.tsx b/ts/components/conversation/header/ConversationHeaderItems.tsx
index 763cdcd9e..69a049d87 100644
--- a/ts/components/conversation/header/ConversationHeaderItems.tsx
+++ b/ts/components/conversation/header/ConversationHeaderItems.tsx
@@ -16,18 +16,16 @@ import { SessionIconButton } from '../../icon';
 
 export const AvatarHeader = (props: {
   pubkey: string;
-  showBackButton: boolean;
   onAvatarClick?: (pubkey: string) => void;
 }) => {
-  const { pubkey, onAvatarClick, showBackButton } = props;
+  const { pubkey, onAvatarClick } = props;
 
   return (
     <span className="module-conversation-header__avatar">
       <Avatar
         size={AvatarSize.S}
         onAvatarClick={() => {
-          // do not allow right panel to appear if another button is shown on the SessionConversation
-          if (onAvatarClick && !showBackButton) {
+          if (onAvatarClick) {
             onAvatarClick(pubkey);
           }
         }}
diff --git a/ts/types/MessageAttachment.ts b/ts/types/MessageAttachment.ts
index 1002c004f..bff81b474 100644
--- a/ts/types/MessageAttachment.ts
+++ b/ts/types/MessageAttachment.ts
@@ -15,8 +15,7 @@ import {
   replaceUnicodeV2,
 } from './attachments/migrations';
 
-// I think this is only used on the renderer side, but how?!
-
+// NOTE I think this is only used on the renderer side, but how?!
 export const deleteExternalMessageFiles = async (message: {
   attachments: any;
   quote: any;