diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index fa2202d8c..be59f5487 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -1291,7 +1291,7 @@ function _Chat() {
           const isContext = i < context.length;
           const showActions =
             i > 0 &&
-            !(message.preview || getMessageTextContent(message).length === 0) &&
+            !(message.preview || message.content.length === 0) &&
             !isContext;
           const showTyping = message.preview || message.streaming;
 
@@ -1375,18 +1375,48 @@ function _Chat() {
                       content={getMessageTextContent(message)}
                       loading={
                         (message.preview || message.streaming) &&
-                        getMessageTextContent(message).length === 0 &&
+                        message.content.length === 0 &&
                         !isUser
                       }
                       // onContextMenu={(e) => onRightClick(e, message)}
                       // onDoubleClickCapture={() => {
                       //   if (!isMobileScreen) return;
-                      //   setUserInput(message.content);
+                      //   setUserInput(getMessageTextContent(message));
                       // }}
                       fontSize={fontSize}
                       parentRef={scrollRef}
                       defaultShow={i >= messages.length - 6}
                     />
+                    {getMessageImages(message).length == 1 && (
+                      <Image
+                        className={styles["chat-message-item-image"]}
+                        src={getMessageImages(message)[0]}
+                        alt=""
+                      />
+                    )}
+                    {getMessageImages(message).length > 1 && (
+                      <div
+                        className={styles["chat-message-item-images"]}
+                        style={
+                          {
+                            "--image-count": getMessageImages(message).length,
+                          } as React.CSSProperties
+                        }
+                      >
+                        {getMessageImages(message).map((image, index) => {
+                          return (
+                            <Image
+                              className={
+                                styles["chat-message-item-image-multi"]
+                              }
+                              key={index}
+                              src={image}
+                              alt=""
+                            />
+                          );
+                        })}
+                      </div>
+                    )}
                   </div>
 
                   {!isUser &&
@@ -1528,64 +1558,6 @@ function _Chat() {
                     </div>
                   )}
                 </div>
-
-                {showTyping && (
-                  <div className={styles["chat-message-status"]}>
-                    {Locale.Chat.Typing}
-                  </div>
-                )}
-                <div className={styles["chat-message-item"]}>
-                  <Markdown
-                    content={getMessageTextContent(message)}
-                    loading={
-                      (message.preview || message.streaming) &&
-                      getMessageTextContent(message).length === 0 &&
-                      !isUser
-                    }
-                    onContextMenu={(e) => onRightClick(e, message)}
-                    onDoubleClickCapture={() => {
-                      if (!isMobileScreen) return;
-                      setUserInput(getMessageTextContent(message));
-                    }}
-                    fontSize={fontSize}
-                    parentRef={scrollRef}
-                    defaultShow={i >= messages.length - 6}
-                  />
-                  {getMessageImages(message).length == 1 && (
-                    <Image
-                      className={styles["chat-message-item-image"]}
-                      src={getMessageImages(message)[0]}
-                      alt=""
-                    />
-                  )}
-                  {getMessageImages(message).length > 1 && (
-                    <div
-                      className={styles["chat-message-item-images"]}
-                      style={
-                        {
-                          "--image-count": getMessageImages(message).length,
-                        } as React.CSSProperties
-                      }
-                    >
-                      {getMessageImages(message).map((image, index) => {
-                        return (
-                          <Image
-                            className={styles["chat-message-item-image-multi"]}
-                            key={index}
-                            src={image}
-                            alt=""
-                          />
-                        );
-                      })}
-                    </div>
-                  )}
-                </div>
-
-                <div className={styles["chat-message-action-date"]}>
-                  {isContext
-                    ? Locale.Chat.IsContext
-                    : message.date.toLocaleString()}
-                </div>
               </div>
               {shouldShowClearContextDivider && <ClearContextDivider />}
             </Fragment>