diff --git a/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift b/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift
index 70f36c3d..0cfbd579 100644
--- a/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift
+++ b/Meshtastic/Extensions/CoreData/MessageEntityExtension.swift
@@ -31,4 +31,11 @@ extension MessageEntity {
 
 		return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()
 	}
+
+	func displayTimestamp(aboveMessage: MessageEntity?) -> Bool {
+		if let aboveMessage = aboveMessage {
+			return aboveMessage.timestamp.addingTimeInterval(900) < timestamp // 15 minutes
+		}
+		return false // First message will have no timestamp
+	}
 }
diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift
index 6093d9eb..458d20ed 100644
--- a/Meshtastic/Views/Messages/ChannelMessageList.swift
+++ b/Meshtastic/Views/Messages/ChannelMessageList.swift
@@ -33,8 +33,15 @@ struct ChannelMessageList: View {
 				ZStack(alignment: .bottomTrailing) {
 					ScrollView {
 						LazyVStack {
-							ForEach(channel.allPrivateMessages) { (message: MessageEntity) in
+							ForEach(Array(channel.allPrivateMessages.enumerated()), id: \.element.id) { index, message in
+								// Get the previous message, if it exists
+								let previousMessage = index > 0 ? channel.allPrivateMessages[index - 1] : nil
 								let currentUser: Bool = (Int64(preferredPeripheralNum) == message.fromUser?.num ? true : false)
+								if message.displayTimestamp(aboveMessage: previousMessage) {
+									Text(message.timestamp.formatted(date: .abbreviated, time: .shortened))
+										.font(.caption)
+										.foregroundColor(.gray)
+								}
 								if message.replyID > 0 {
 									let messageReply = channel.allPrivateMessages.first(where: { $0.messageId == message.replyID })
 									HStack {
@@ -44,7 +51,6 @@ struct ChannelMessageList: View {
 													messageToHighlight = messageNum
 												}
 												scrollView.scrollTo(messageNum, anchor: .center)
-												
 												// Reset highlight after delay
 												Task {
 													try? await Task.sleep(nanoseconds: 1_000_000_000) // 1 second
diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift
index 686decaf..54ff0b4d 100644
--- a/Meshtastic/Views/Messages/UserMessageList.swift
+++ b/Meshtastic/Views/Messages/UserMessageList.swift
@@ -33,7 +33,14 @@ struct UserMessageList: View {
 				ZStack(alignment: .bottomTrailing) {
 					ScrollView {
 						LazyVStack {
-							ForEach( user.messageList ) { (message: MessageEntity) in
+							ForEach( Array(user.messageList.enumerated()) , id: \.element.id) { index, message in
+								// Get the previous message, if it exists
+								let previousMessage = index > 0 ? user.messageList[index - 1] : nil
+								if message.displayTimestamp(aboveMessage: previousMessage) {
+									Text(message.timestamp.formatted(date: .abbreviated, time: .shortened))
+										.font(.caption)
+										.foregroundColor(.gray)
+								} 
 								if user.num != bleManager.connectedPeripheral?.num ?? -1 {
 									let currentUser: Bool = (Int64(UserDefaults.preferredPeripheralNum) == message.fromUser?.num ?? -1 ? true : false)