diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift
index 4480b53b..c2361ccb 100644
--- a/Meshtastic/Views/Messages/ChannelMessageList.swift
+++ b/Meshtastic/Views/Messages/ChannelMessageList.swift
@@ -26,142 +26,143 @@ struct ChannelMessageList: View {
 	var body: some View {
 		VStack {
 			ScrollViewReader { scrollView in
-				ScrollView {
-					LazyVStack {
-						ForEach( channel.allPrivateMessages ) { (message: MessageEntity) in
-							let currentUser: Bool = (Int64(preferredPeripheralNum) == message.fromUser?.num ? true : false)
-							if message.replyID > 0 {
-								let messageReply = channel.allPrivateMessages.first(where: { $0.messageId == message.replyID })
-								HStack {
-									Text(messageReply?.messagePayload ?? "EMPTY MESSAGE").foregroundColor(.accentColor).font(.caption2)
-										.padding(10)
-										.overlay(
-											RoundedRectangle(cornerRadius: 18)
-												.stroke(Color.blue, lineWidth: 0.5)
-										)
-									Image(systemName: "arrowshape.turn.up.left.fill")
-										.symbolRenderingMode(.hierarchical)
-										.imageScale(.large).foregroundColor(.accentColor)
-										.padding(.trailing)
-								}
-							}
-							HStack(alignment: .bottom) {
-								if currentUser { Spacer(minLength: 50) }
-								if !currentUser {
-									CircleText(text: message.fromUser?.shortName ?? "?", color: Color(UIColor(hex: UInt32(message.fromUser?.num ?? 0))), circleSize: 44, node: getNodeInfo(id: Int64(message.fromUser?.num ?? 0), context: context))
-										.padding(.all, 5)
-										.offset(y: -7)
-								}
-
-								VStack(alignment: currentUser ? .trailing : .leading) {
-									let isDetectionSensorMessage = message.portNum == Int32(PortNum.detectionSensorApp.rawValue)
-
-									if !currentUser && message.fromUser != nil {
-										Text("\(message.fromUser?.longName ?? "unknown".localized ) (\(message.fromUser?.userId ?? "?"))")
-											.font(.caption)
-											.foregroundColor(.gray)
-											.offset(y: 8)
-									}
-
+				ZStack(alignment: .bottomTrailing) {
+					ScrollView {
+						LazyVStack {
+							ForEach(channel.allPrivateMessages) { (message: MessageEntity) in
+								let currentUser: Bool = (Int64(preferredPeripheralNum) == message.fromUser?.num ? true : false)
+								if message.replyID > 0 {
+									let messageReply = channel.allPrivateMessages.first(where: { $0.messageId == message.replyID })
 									HStack {
-										MessageText(
-											message: message,
-											tapBackDestination: .channel(channel),
-											isCurrentUser: currentUser
-										) {
-											self.replyMessageId = message.messageId
-											self.messageFieldFocused = true
-										}
-
-										if currentUser && message.canRetry {
-											RetryButton(message: message, destination: .channel(channel))
-										}
-									}
-
-									TapbackResponses(message: message) {
-										appState.unreadChannelMessages = myInfo.unreadMessages
-										context.refresh(myInfo, mergeChanges: true)
-									}
-
-									HStack {
-										let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
-										if currentUser && message.receivedACK {
-											Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
-												.foregroundStyle(ackErrorVal?.color ?? Color.red)
-												.font(.caption2)
-										} else if currentUser && message.ackError == 0 {
-											// Empty Error
-											Text("Waiting to be acknowledged. . .").font(
-												.caption2)
-												.foregroundColor(.orange)
-										} else if currentUser && !isDetectionSensorMessage {
-											Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
-												.foregroundStyle(ackErrorVal?.color ?? Color.red)
-												.font(.caption2)
-										}
+										Text(messageReply?.messagePayload ?? "EMPTY MESSAGE").foregroundColor(.accentColor).font(.caption2)
+											.padding(10)
+											.overlay(
+												RoundedRectangle(cornerRadius: 18)
+													.stroke(Color.blue, lineWidth: 0.5)
+											)
+										Image(systemName: "arrowshape.turn.up.left.fill")
+											.symbolRenderingMode(.hierarchical)
+											.imageScale(.large).foregroundColor(.accentColor)
+											.padding(.trailing)
 									}
 								}
-								.padding(.bottom)
-								.id(channel.allPrivateMessages.firstIndex(of: message))
+								HStack(alignment: .bottom) {
+									if currentUser { Spacer(minLength: 50) }
+									if !currentUser {
+										CircleText(text: message.fromUser?.shortName ?? "?", color: Color(UIColor(hex: UInt32(message.fromUser?.num ?? 0))), circleSize: 44, node: getNodeInfo(id: Int64(message.fromUser?.num ?? 0), context: context))
+											.padding(.all, 5)
+											.offset(y: -7)
+									}
 
-								if !currentUser {
-									Spacer(minLength: 50)
-								}
-							}
-							.padding([.leading, .trailing])
-							.frame(maxWidth: .infinity)
-							.id(message.messageId)
-							.onAppear {
-								if !message.read {
-									message.read = true
-									do {
-										for unreadMessage in channel.allPrivateMessages.filter({ !$0.read }) {
-											unreadMessage.read = true
+									VStack(alignment: currentUser ? .trailing : .leading) {
+										let isDetectionSensorMessage = message.portNum == Int32(PortNum.detectionSensorApp.rawValue)
+
+										if !currentUser && message.fromUser != nil {
+											Text("\(message.fromUser?.longName ?? "unknown".localized ) (\(message.fromUser?.userId ?? "?"))")
+												.font(.caption)
+												.foregroundColor(.gray)
+												.offset(y: 8)
+										}
+
+										HStack {
+											MessageText(
+												message: message,
+												tapBackDestination: .channel(channel),
+												isCurrentUser: currentUser
+											) {
+												self.replyMessageId = message.messageId
+												self.messageFieldFocused = true
+											}
+
+											if currentUser && message.canRetry {
+												RetryButton(message: message, destination: .channel(channel))
+											}
+										}
+
+										TapbackResponses(message: message) {
+											appState.unreadChannelMessages = myInfo.unreadMessages
+											context.refresh(myInfo, mergeChanges: true)
+										}
+
+										HStack {
+											let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
+											if currentUser && message.receivedACK {
+												Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
+													.foregroundStyle(ackErrorVal?.color ?? Color.red)
+													.font(.caption2)
+											} else if currentUser && message.ackError == 0 {
+												// Empty Error
+												Text("Waiting to be acknowledged. . .").font(
+													.caption2)
+													.foregroundColor(.orange)
+											} else if currentUser && !isDetectionSensorMessage {
+												Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
+													.foregroundStyle(ackErrorVal?.color ?? Color.red)
+													.font(.caption2)
+											}
+										}
+									}
+									.padding(.bottom)
+
+									if !currentUser {
+										Spacer(minLength: 50)
+									}
+								}
+								.padding([.leading, .trailing])
+								.frame(maxWidth: .infinity)
+								.id(message.messageId)
+								.onAppear {
+									if !message.read {
+										message.read = true
+										do {
+											for unreadMessage in channel.allPrivateMessages.filter({ !$0.read }) {
+												unreadMessage.read = true
+											}
+											try context.save()
+											Logger.data.info("📖 [App] Read message \(message.messageId, privacy: .public) ")
+											appState.unreadChannelMessages = myInfo.unreadMessages
+											context.refresh(myInfo, mergeChanges: true)
+										} catch {
+											Logger.data.error("Failed to read message \(message.messageId, privacy: .public): \(error.localizedDescription, privacy: .public)")
 										}
-										try context.save()
-										Logger.data.info("📖 [App] Read message \(message.messageId, privacy: .public) ")
-										appState.unreadChannelMessages = myInfo.unreadMessages
-										context.refresh(myInfo, mergeChanges: true)
-									} catch {
-										Logger.data.error("Failed to read message \(message.messageId, privacy: .public): \(error.localizedDescription, privacy: .public)")
 									}
 								}
 							}
 						}
 					}
-				}
-				.scrollDismissesKeyboard(.interactively)
-				.onFirstAppear {
-					withAnimation {
-						scrollView.scrollTo(channel.allPrivateMessages.last?.messageId ?? 0, anchor: .bottom)
+					.scrollDismissesKeyboard(.interactively)
+					.onFirstAppear {
+						withAnimation {
+							scrollView.scrollTo(channel.allPrivateMessages.last?.messageId ?? 0, anchor: .bottom)
+						}
+					}
+					.onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardDidShowNotification)) { _ in
+						withAnimation {
+							scrollView.scrollTo(channel.allPrivateMessages.last?.messageId ?? 0, anchor: .bottom)
+						}
+					}
+					.onChange(of: channel.allPrivateMessages) {
+						withAnimation {
+							scrollView.scrollTo(channel.allPrivateMessages.last?.messageId ?? 0, anchor: .bottom)
+						}
 					}
 				}
-				.onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardDidShowNotification)) { _ in
-					withAnimation {
-						scrollView.scrollTo(channel.allPrivateMessages.last?.messageId ?? 0, anchor: .bottom)
-					}
-				}
-				.onChange(of: channel.allPrivateMessages) {
-					withAnimation {
-						scrollView.scrollTo(channel.allPrivateMessages.last?.messageId ?? 0, anchor: .bottom)
-					}
-				}
-			}
 
-			TextMessageField(
-				destination: .channel(channel),
-				replyMessageId: $replyMessageId,
-				isFocused: $messageFieldFocused
-			) {
-				context.refresh(channel, mergeChanges: true)
+				TextMessageField(
+					destination: .channel(channel),
+					replyMessageId: $replyMessageId,
+					isFocused: $messageFieldFocused
+				) {
+					context.refresh(channel, mergeChanges: true)
+				}
 			}
 		}
 		.navigationBarTitleDisplayMode(.inline)
 		.toolbar {
 			ToolbarItem(placement: .principal) {
 				HStack {
-						CircleText(text: String(channel.index), color: .accentColor, circleSize: 44).fixedSize()
-						Text(String(channel.name ?? "unknown".localized).camelCaseToWords()).font(.headline)
+					CircleText(text: String(channel.index), color: .accentColor, circleSize: 44).fixedSize()
+					Text(String(channel.name ?? "unknown".localized).camelCaseToWords()).font(.headline)
 				}
 			}
 			ToolbarItem(placement: .navigationBarTrailing) {