diff --git a/src/View/Components/chatMessage.tsx b/src/View/Components/chatMessage.tsx
index 5d8829a1..416db768 100644
--- a/src/View/Components/chatMessage.tsx
+++ b/src/View/Components/chatMessage.tsx
@@ -69,7 +69,8 @@ export function ChatMessage(
                         aria-label={
                             coreViewModel.translations.chatPage.message
                                 .replyToMessageButton
-                        }
+			    }
+			    toggle:hidden={chatMessageViewModel.messagePageViewModel.isReplyViewActive}
                     >
                         <span class="icon">reply</span>
                     </button>
diff --git a/src/View/Components/replyViewHeader.tsx b/src/View/Components/replyViewHeader.tsx
index 80c3356d..4802d6a3 100644
--- a/src/View/Components/replyViewHeader.tsx
+++ b/src/View/Components/replyViewHeader.tsx
@@ -3,7 +3,7 @@ import CoreViewModel from "../../ViewModel/Global/coreViewModel";
 import MessagePageViewModel from "../../ViewModel/Pages/messagePageViewModel";
 
 export function ReplyViewHeader(coreViewModel: CoreViewModel, messagePageViewModel: MessagePageViewModel) {
-    const isHidden = React.createProxyState([messagePageViewModel.replyViewSelectedMessage], ()=>messagePageViewModel.replyViewSelectedMessage.value == undefined);
+    const isHidden = React.createProxyState([messagePageViewModel.isReplyViewActive], ()=>!messagePageViewModel.isReplyViewActive.value);
 
     const label = React.createProxyState([messagePageViewModel.replyViewSelectedMessage], ()=>messagePageViewModel.replyViewSelectedMessage.value == undefined ? "" : coreViewModel.translations.chatPage.message.replyHeaderLabel(messagePageViewModel.replyViewSelectedMessage.value.sender));
     const message = React.createProxyState([messagePageViewModel.replyViewSelectedMessage], ()=>messagePageViewModel.replyViewSelectedMessage.value == undefined ? "" : messagePageViewModel.replyViewSelectedMessage.value.body.value);
diff --git a/src/View/Modals/chatMessageInfoModal.tsx b/src/View/Modals/chatMessageInfoModal.tsx
index e8017bcb..1373ed53 100644
--- a/src/View/Modals/chatMessageInfoModal.tsx
+++ b/src/View/Modals/chatMessageInfoModal.tsx
@@ -72,7 +72,10 @@ export function ChatMessageInfoModal(
                             }
                             <span class="icon">key</span>
                         </button>
-                        <button on:click={chatMessageViewModel.reply}>
+			<button 
+			    on:click={chatMessageViewModel.reply}
+			    toggle:disabled={chatMessageViewModel.messagePageViewModel.isReplyViewActive}
+			>
                             {
                                 coreViewModel.translations.chatPage.message
                                     .replyToMessageButton
diff --git a/src/ViewModel/Global/coreViewModel.ts b/src/ViewModel/Global/coreViewModel.ts
index cb51ded0..babb9fa6 100644
--- a/src/ViewModel/Global/coreViewModel.ts
+++ b/src/ViewModel/Global/coreViewModel.ts
@@ -9,7 +9,7 @@ import ConnectionModel from "../../Model/Global/connectionModel";
 import ChatListModel from "../../Model/Chat/chatListModel";
 
 export default class CoreViewModel {
-    readonly BUILD = "Build 26.09.24.A";
+    readonly BUILD = "Build 26.09.24.B";
 
     translations: Translations;
 
diff --git a/src/ViewModel/Pages/messagePageViewModel.ts b/src/ViewModel/Pages/messagePageViewModel.ts
index f17dff8e..945375ec 100644
--- a/src/ViewModel/Pages/messagePageViewModel.ts
+++ b/src/ViewModel/Pages/messagePageViewModel.ts
@@ -17,6 +17,7 @@ export default class MessagePageViewModel extends Context {
     filteredMessageViewModels: React.ListState<ChatMessageViewModel> =
         new React.ListState();
     replyViewSelectedMessage: React.State<ChatMessageViewModel|undefined> = new React.State(undefined);
+    isReplyViewActive: React.State<boolean> = React.createProxyState([this.replyViewSelectedMessage], ()=>this.replyViewSelectedMessage.value != undefined);
     searchViewModel: SearchViewModel<ChatMessageViewModel>;
     isFilterModalOpen = new React.State<boolean>(false);
     reactionFilter = new React.State<ReactionSymbols | undefined>(undefined);