diff --git a/bitchat/Views/ContentView.swift b/bitchat/Views/ContentView.swift
index 2cedae5a..33b72031 100644
--- a/bitchat/Views/ContentView.swift
+++ b/bitchat/Views/ContentView.swift
@@ -204,6 +204,14 @@ struct ContentView: View {
             isPresented: $showMessageActions,
             titleVisibility: .visible
         ) {
+            Button("mention") {
+                if let sender = selectedMessageSender {
+                    // Pre-fill the input with an @mention and focus the field
+                    messageText = "@\(sender) "
+                    isTextFieldFocused = true
+                }
+            }
+
             Button("private message") {
                 if let peerID = selectedMessageSenderID {
                     #if os(iOS)