diff --git a/src/components/chat/welcome-input-panel.tsx b/src/components/chat/welcome-input-panel.tsx
index 813fd27..bde7f60 100644
--- a/src/components/chat/welcome-input-panel.tsx
+++ b/src/components/chat/welcome-input-panel.tsx
@@ -856,15 +856,15 @@ export function WelcomeInputPanel({
             {history.map((msg) => (
               <div key={msg.id}>
                 <Message from={msg.role === "tool" ? "assistant" : msg.role}>
-                  <MessageContent>
-                    <ContentPartsRenderer parts={msg.content} role={msg.role} />
-                  </MessageContent>
                   {msg.role === "user" && msg.userImages?.length ? (
                     <UserImageAttachments
                       images={msg.userImages}
                       className="self-end"
                     />
                   ) : null}
+                  <MessageContent>
+                    <ContentPartsRenderer parts={msg.content} role={msg.role} />
+                  </MessageContent>
                   {msg.role === "user" && msg.userResources?.length ? (
                     <UserResourceLinks
                       resources={msg.userResources}
diff --git a/src/components/message/message-list-view.tsx b/src/components/message/message-list-view.tsx
index 40dd0ee..9e21d72 100644
--- a/src/components/message/message-list-view.tsx
+++ b/src/components/message/message-list-view.tsx
@@ -132,12 +132,12 @@ const HistoricalMessageGroup = memo(function HistoricalMessageGroup({
       }}
     >
       <Message from={group.role}>
-        <MessageContent>
-          <ContentPartsRenderer parts={group.parts} role={group.role} />
-        </MessageContent>
         {group.role === "user" && group.images.length > 0 ? (
           <UserImageAttachments images={group.images} className="self-end" />
         ) : null}
+        <MessageContent>
+          <ContentPartsRenderer parts={group.parts} role={group.role} />
+        </MessageContent>
         {group.role === "user" && group.resources.length > 0 ? (
           <UserResourceLinks resources={group.resources} className="self-end" />
         ) : null}
@@ -162,12 +162,12 @@ const PendingMessageGroup = memo(function PendingMessageGroup({
   return (
     <div className="opacity-70">
       <Message from={group.role}>
-        <MessageContent>
-          <ContentPartsRenderer parts={group.parts} role={group.role} />
-        </MessageContent>
         {group.role === "user" && group.images.length > 0 ? (
           <UserImageAttachments images={group.images} className="self-end" />
         ) : null}
+        <MessageContent>
+          <ContentPartsRenderer parts={group.parts} role={group.role} />
+        </MessageContent>
         {group.role === "user" && group.resources.length > 0 ? (
           <UserResourceLinks resources={group.resources} className="self-end" />
         ) : null}