diff --git a/components/DiscordLive/DiscordMessageList.tsx b/components/DiscordLive/DiscordMessageList.tsx
index fa69ae56..3643df26 100644
--- a/components/DiscordLive/DiscordMessageList.tsx
+++ b/components/DiscordLive/DiscordMessageList.tsx
@@ -2,6 +2,7 @@ import { DiscordMessage, DiscordMessages } from "@skyra/discord-components-react
 import { ReactNode } from "react"
 import styles from './DiscordLive.module.css'
 import { formatDiscordContent } from "./DiscordLive"
+import { TimeUtil } from "../../utils/TimeUtil"
 
 type DiscordMessageType = {
   id: number,
@@ -22,7 +23,13 @@ type DiscordMessageListProps = {
 export default function DiscordMessageList({ visibleMessages, recursiveContent }: DiscordMessageListProps) {
   return <DiscordMessages className={styles.discordMessages}>
     {visibleMessages.map((message, i) => visibleMessages[i - 1]?.author?.name != visibleMessages[i].author.name ? (
-      <DiscordMessage key={message.id} avatar={`/discordlive/avatars/${message.author.avatar}`} author={message.author.name} roleColor={message.author.color}>
+      <DiscordMessage
+        key={message.id}
+        avatar={`/discordlive/avatars/${message.author.avatar}`}
+        timestamp={TimeUtil.formatTimestamp(message.timestamp)}
+        author={message.author.name}
+        roleColor={message.author.color}
+      >
         <span className="discord-message-markup">{formatDiscordContent(message.content)}</span>
         <span className="discord-message-markup">{recursiveContent(i)}</span>
       </DiscordMessage>
diff --git a/utils/TimeUtil.ts b/utils/TimeUtil.ts
index 21a20b9f..e2e5deca 100644
--- a/utils/TimeUtil.ts
+++ b/utils/TimeUtil.ts
@@ -70,6 +70,18 @@ export class TimeUtil {
         );
     }
 
+    /**
+     * Formats a timestamp into a string representation of the date and time.
+     * 
+     * Format: DD.MM.YYYY hh.mm
+     */
+    static formatTimestamp(timestamp: number) {
+        const date = new Date(timestamp);
+        const day = date.toLocaleDateString("Fi");
+        const time = date.toLocaleTimeString("Fi", {timeStyle: "short"});
+        return `${day} ${time}`;
+    }
+
     // Helper function to format the date as "d. mmmm." or "d. mmmm yyyy."
     static formatFinnishDate = (date: Date): string => {
         const day = date.getDate();
@@ -87,7 +99,6 @@ export class TimeUtil {
     /**
      * Format date into a readable string in relation to the current date
      */
-    
     static formatDateInRelationToCurrent(date: Date): string {
         const now = new Date();