diff --git a/src/View/Components/infoTile.tsx b/src/View/Components/infoTile.tsx
new file mode 100644
index 00000000..4c5e3223
--- /dev/null
+++ b/src/View/Components/infoTile.tsx
@@ -0,0 +1,18 @@
+import * as React from "bloatless-react";
+
+export function InfoTile(icon: string, label: string, content: string|React.State<string>) {
+    let contentState: React.State<string>
+    if (typeof content == "string") {
+        contentState = new React.State(content);
+    } else {
+        contentState = content;
+    }
+
+    return <div class="tile">
+        <span class="icon">{icon}</span>
+        <div>
+            <span>{label}</span>
+            <b class="break-word" subscribe:innerText={contentState}></b>
+        </div>
+    </div>;
+}
diff --git a/src/View/Modals/chatMessageInfoModal.tsx b/src/View/Modals/chatMessageInfoModal.tsx
index 5060f075..cad1c1d6 100644
--- a/src/View/Modals/chatMessageInfoModal.tsx
+++ b/src/View/Modals/chatMessageInfoModal.tsx
@@ -3,6 +3,7 @@ import * as React from "bloatless-react";
 import ChatMessageViewModel from "../../ViewModel/Chat/chatMessageViewModel";
 import { translations } from "../translations";
 import { MessageReactionButtonRow } from "../Components/messageReactionButtonRow";
+import { InfoTile } from "../Components/infoTile";
 
 export function ChatMessageInfoModal(
     chatMessageViewModel: ChatMessageViewModel,
@@ -17,59 +18,10 @@ export function ChatMessageInfoModal(
                     <h2>{translations.chatPage.message.messageInfoHeadline}</h2>
 
                     <div class="flex-column gap">
-                        <div class="tile">
-                            <span class="icon">account_circle</span>
-                            <div>
-                                <span>
-                                    {translations.chatPage.message.sentBy}
-                                </span>
-                                <b class="break-word">
-                                    {chatMessageViewModel.sender}
-                                </b>
-                            </div>
-                        </div>
-
-                        <div class="tile">
-                            <span class="icon">schedule</span>
-                            <div>
-                                <span>
-                                    {translations.chatPage.message.timeSent}
-                                </span>
-                                <b class="break-word">
-                                    {chatMessageViewModel.dateSent}
-                                </b>
-                            </div>
-                        </div>
-
-                        <div class="tile">
-                            <span class="icon">forum</span>
-                            <div>
-                                <span>
-                                    {translations.chatPage.message.channel}
-                                </span>
-                                <b class="break-word">
-                                    {chatMessageViewModel.channel}
-                                </b>
-                            </div>
-                        </div>
-
-                        <div class="tile">
-                            <span class="icon">description</span>
-                            <div>
-                                <span>
-                                    {
-                                        translations.chatPage.message
-                                            .messageContent
-                                    }
-                                </span>
-                                <b
-                                    class="break-word"
-                                    subscribe:innerText={
-                                        chatMessageViewModel.body
-                                    }
-                                ></b>
-                            </div>
-                        </div>
+                        {InfoTile("account_circle", translations.chatPage.message.sentBy, chatMessageViewModel.sender)}
+                        {InfoTile("schedule", translations.chatPage.message.timeSent, chatMessageViewModel.dateSent)}
+                        {InfoTile("forum", translations.chatPage.message.channel, chatMessageViewModel.channel)}
+                        {InfoTile("description", translations.chatPage.message.messageContent, chatMessageViewModel.body)}
                     </div>
 
                     <hr></hr>