diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index c479a08a..02c0dd92 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -730,16 +730,18 @@ export function Chat() {
     deleteMessage(msgId);
   };
 
-  const onResend = (botMessageId: number) => {
-    // find last user input message and resend
-    const userIndex = findLastUserIndex(botMessageId);
-    if (userIndex === null) return;
+  const onResend = (message: ChatMessage) => {
+    let content = message.content;
+
+    if (message.role === "assistant" && message.id) {
+      const userIndex = findLastUserIndex(message.id);
+      if (userIndex) {
+        content = session.messages.at(userIndex)?.content ?? content;
+      }
+    }
 
     setIsLoading(true);
-    const userMsg = session.messages[userIndex];
-    deleteMessage(userMsg.id);
-    deleteMessage(botMessageId);
-    chatStore.onUserInput(userMsg.content).then(() => setIsLoading(false));
+    chatStore.onUserInput(content).then(() => setIsLoading(false));
     inputRef.current?.focus();
   };
 
@@ -918,12 +920,11 @@ export function Chat() {
       >
         {messages.map((message, i) => {
           const isUser = message.role === "user";
-          // const showActions =
-          //   !isUser &&
-          //   i > 0 &&
-          //   !(message.preview || message.content.length === 0) &&
-          //   i >= context.length; // do not show actions for context prompts
-          const showActions = true;
+          const isContext = i < context.length;
+          const showActions =
+            i > 0 &&
+            !(message.preview || message.content.length === 0) &&
+            !isContext;
           const showTyping = message.preview || message.streaming;
 
           const shouldShowClearContextDivider = i === clearContextIndex - 1;
@@ -980,7 +981,7 @@ export function Chat() {
                               <ChatAction
                                 text={Locale.Chat.Actions.Retry}
                                 icon={<ResetIcon />}
-                                onClick={() => onResend(message.id ?? i)}
+                                onClick={() => onResend(message)}
                               />
 
                               <ChatAction
@@ -1028,11 +1029,11 @@ export function Chat() {
                     />
                   </div>
 
-                  {showActions && (
-                    <div className={styles["chat-message-action-date"]}>
-                      {message.date.toLocaleString()}
-                    </div>
-                  )}
+                  <div className={styles["chat-message-action-date"]}>
+                    {isContext
+                      ? Locale.Chat.IsContext
+                      : message.date.toLocaleString()}
+                  </div>
                 </div>
               </div>
               {shouldShowClearContextDivider && <ClearContextDivider />}
diff --git a/app/locales/cn.ts b/app/locales/cn.ts
index c6ba4ed7..c32014be 100644
--- a/app/locales/cn.ts
+++ b/app/locales/cn.ts
@@ -66,6 +66,7 @@ const cn = {
       Reset: "清除记忆",
       SaveAs: "存为面具",
     },
+    IsContext: "预设提示词",
   },
   Export: {
     Title: "分享聊天记录",
diff --git a/app/locales/en.ts b/app/locales/en.ts
index 23b6e7ca..d96b978f 100644
--- a/app/locales/en.ts
+++ b/app/locales/en.ts
@@ -68,6 +68,7 @@ const en: LocaleType = {
       Reset: "Reset to Default",
       SaveAs: "Save as Mask",
     },
+    IsContext: "Contextual Prompt",
   },
   Export: {
     Title: "Export Messages",