diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift
index 406623a0..d645b613 100644
--- a/Meshtastic/Views/Messages/ChannelMessageList.swift
+++ b/Meshtastic/Views/Messages/ChannelMessageList.swift
@@ -52,13 +52,20 @@ struct ChannelMessageList: View {
 								}
 								VStack(alignment: currentUser ? .trailing : .leading) {
 									let isDetectionSensorMessage = message.portNum == Int32(PortNum.detectionSensorApp.rawValue)
-									MessageText(
-										message: message,
-										tapBackDestination: .channel(channel),
-										isCurrentUser: currentUser
-									) {
-										self.replyMessageId = message.messageId
-										self.messageFieldFocused = true
+
+									HStack {
+										MessageText(
+											message: message,
+											tapBackDestination: .channel(channel),
+											isCurrentUser: currentUser
+										) {
+											self.replyMessageId = message.messageId
+											self.messageFieldFocused = true
+										}
+
+										if currentUser && message.canRetry {
+											RetryButton(message: message)
+										}
 									}
 
 									TapbackResponses(message: message) {
@@ -87,10 +94,6 @@ struct ChannelMessageList: View {
 								.padding(.bottom)
 								.id(channel.allPrivateMessages.firstIndex(of: message))
 
-								if currentUser && message.canRetry {
-									RetryButton(message: message)
-								}
-
 								if !currentUser {
 									Spacer(minLength: 50)
 								}
diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift
index 9f777b4a..7816167d 100644
--- a/Meshtastic/Views/Messages/UserMessageList.swift
+++ b/Meshtastic/Views/Messages/UserMessageList.swift
@@ -46,13 +46,19 @@ struct UserMessageList: View {
 								HStack(alignment: .top) {
 									if currentUser { Spacer(minLength: 50) }
 									VStack(alignment: currentUser ? .trailing : .leading) {
-										MessageText(
-											message: message,
-											tapBackDestination: .user(user),
-											isCurrentUser: currentUser
-										) {
-											self.replyMessageId = message.messageId
-											self.messageFieldFocused = true
+										HStack {
+											MessageText(
+												message: message,
+												tapBackDestination: .user(user),
+												isCurrentUser: currentUser
+											) {
+												self.replyMessageId = message.messageId
+												self.messageFieldFocused = true
+											}
+
+											if currentUser && message.canRetry || (message.receivedACK && !message.realACK) {
+												RetryButton(message: message)
+											}
 										}
 
 										TapbackResponses(message: message) {
@@ -81,10 +87,6 @@ struct UserMessageList: View {
 									.padding(.bottom)
 									.id(user.messageList.firstIndex(of: message))
 
-									if currentUser && message.canRetry || (message.receivedACK && !message.realACK) {
-										RetryButton(message: message)
-									}
-
 									if !currentUser {
 										Spacer(minLength: 50)
 									}