diff --git a/packages/module/patternfly-docs/content/extensions/virtual-assistant/examples/Messages/MessageWithAttachment.tsx b/packages/module/patternfly-docs/content/extensions/virtual-assistant/examples/Messages/MessageWithAttachment.tsx
index e3a11f503..0ec1fa582 100644
--- a/packages/module/patternfly-docs/content/extensions/virtual-assistant/examples/Messages/MessageWithAttachment.tsx
+++ b/packages/module/patternfly-docs/content/extensions/virtual-assistant/examples/Messages/MessageWithAttachment.tsx
@@ -5,11 +5,27 @@ import PreviewAttachment from '@patternfly/virtual-assistant/dist/dynamic/Previe
 import AttachmentEdit from '@patternfly/virtual-assistant/dist/dynamic/AttachmentEdit';
 import userAvatar from './user_avatar.jpg';
 
+interface ModalData {
+  code: string;
+  fileName: string;
+}
+
 export const AttachmentMenuExample: React.FunctionComponent = () => {
   const [isPreviewModalOpen, setIsPreviewModalOpen] = React.useState<boolean>(false);
   const [isEditModalOpen, setIsEditModalOpen] = React.useState<boolean>(false);
   const [currentModalData, setCurrentModalData] = React.useState<ModalData>();
 
+  const onClick = (event: React.MouseEvent, name: string) => {
+    setCurrentModalData({ fileName: name, code: 'test' });
+    setIsEditModalOpen(false);
+    setIsPreviewModalOpen(true);
+  };
+
+  const onClose = (event: React.MouseEvent, name: string, id: number | string | undefined) => {
+    // eslint-disable-next-line no-console
+    console.log(`Closed attachment with name: ${name} and id: ${id}`);
+  };
+
   return (
     <>
       <Message
@@ -17,17 +33,17 @@ export const AttachmentMenuExample: React.FunctionComponent = () => {
         role="user"
         avatar={userAvatar}
         content="Here is an uploaded file"
-        attachmentName="auth-operator.yml"
-        attachmentId="1"
-        onAttachmentClick={() => {
-          setCurrentModalData({ fileName: 'auth-operator.yml', code: 'test' });
-          setIsEditModalOpen(false);
-          setIsPreviewModalOpen(true);
-        }}
-        onAttachmentClose={(id: string) => {
-          // eslint-disable-next-line no-console
-          console.log(`Closed attachment id ${id}`);
-        }}
+        attachments={[{ name: 'auth-operator.yml', id: '1', onClick, onClose }]}
+      />
+      <Message
+        name="User"
+        role="user"
+        avatar={userAvatar}
+        content="Here are two uploaded files"
+        attachments={[
+          { name: 'auth-operator.yml', id: '1' },
+          { name: 'patternfly.svg', id: '2' }
+        ]}
       />
       {currentModalData && (
         <PreviewAttachment
diff --git a/packages/module/patternfly-docs/content/extensions/virtual-assistant/examples/Messages/Messages.md b/packages/module/patternfly-docs/content/extensions/virtual-assistant/examples/Messages/Messages.md
index b78c0694d..d1d53bda1 100644
--- a/packages/module/patternfly-docs/content/extensions/virtual-assistant/examples/Messages/Messages.md
+++ b/packages/module/patternfly-docs/content/extensions/virtual-assistant/examples/Messages/Messages.md
@@ -10,18 +10,19 @@ id: Messages
 source: react
 # If you use typescript, the name of the interface to display props for
 # These are found through the sourceProps function provided in patternfly-docs.source.js
-propComponents: [
-    'AttachMenu', 
-    'AttachmentEdit', 
-    'FileDetails', 
-    'FileDetailsLabel', 
-    'FileDropZone', 
+propComponents:
+  [
+    'AttachMenu',
+    'AttachmentEdit',
+    'FileDetails',
+    'FileDetailsLabel',
+    'FileDropZone',
     'PreviewAttachment',
     'Message',
     'PreviewAttachment',
     'ActionProps',
     'SourcesCardProps'
-]
+  ]
 sortValue: 3
 ---
 
@@ -122,7 +123,7 @@ If a `displayMode` is not passed to `<PreviewAttachment>` or `<AttachmentEdit>`,
 
 ```
 
-We are using [react-dropzone](https://react-dropzone.js.org) for opening the file dialog and handling drag and drop. It does not process files or provide any way to make HTTP requests to a server. If you need this, [react-dropzone](https://react-dropzone.js.org) suggests [filepond](https://pqina.nl/filepond/) or [uppy.io.](https://uppy.io/)
+We are using [react-dropzone](https://react-dropzone.js.org) for opening the file dialog and handling drag and drop. It does not process files or provide any way to make HTTP requests to a server. If you need this, [react-dropzone](https://react-dropzone.js.org) suggests [filepond](https://pqina.nl/filepond/) or [uppy.io.](https://uppy.io/). To handle edge cases, like restricting the number or size of files, you can pass a function to the `handleAttach` prop on `MessageBar` or `onFileDrop` prop in `FileDropZone.`
 
 ### Attachment label
 
diff --git a/packages/module/src/FileDetailsLabel/FileDetailsLabel.tsx b/packages/module/src/FileDetailsLabel/FileDetailsLabel.tsx
index b4d5f86a2..461364f07 100644
--- a/packages/module/src/FileDetailsLabel/FileDetailsLabel.tsx
+++ b/packages/module/src/FileDetailsLabel/FileDetailsLabel.tsx
@@ -7,12 +7,14 @@ import { TimesIcon } from '@patternfly/react-icons';
 interface FileDetailsLabelProps {
   /** Name of file, including extension */
   fileName: string;
+  /** Unique id of file */
+  fileId?: string | number;
   /** Whether to display loading icon */
   isLoading?: boolean;
   /** Callback function for when label is clicked */
-  onClick?: (event: React.MouseEvent) => void;
+  onClick?: (event: React.MouseEvent, fileName: string, fileId?: string | number) => void;
   /** Callback function for when close button is clicked */
-  onClose?: (event: React.MouseEvent) => void;
+  onClose?: (event: React.MouseEvent, fileName: string, fileId?: string | number) => void;
   /** Aria label for close button */
   closeButtonAriaLabel?: string;
   /** Custom test id for the component-generated language */
@@ -23,36 +25,42 @@ interface FileDetailsLabelProps {
 
 export const FileDetailsLabel = ({
   fileName,
+  fileId,
   isLoading,
-  onClick = undefined,
-  onClose = undefined,
+  onClick,
+  onClose,
   closeButtonAriaLabel,
   languageTestId,
   spinnerTestId
-}: PropsWithChildren<FileDetailsLabelProps>) => (
-  <Label
-    className="pf-chatbot__file-label"
-    onClose={onClose}
-    closeBtn={
-      <Button
-        type="button"
-        variant="plain"
-        onClick={onClose}
-        aria-label={closeButtonAriaLabel ?? `Close ${fileName}`}
-        icon={<TimesIcon />}
-      />
-    }
-    onClick={onClick}
-  >
-    <div className="pf-chatbot__file-label-contents">
-      <FileDetails
-        className={isLoading ? 'pf-chatbot__file-label-loading' : undefined}
-        fileName={fileName}
-        languageTestId={languageTestId}
-      />
-      {isLoading && <Spinner data-testid={spinnerTestId} size="sm" />}
-    </div>
-  </Label>
-);
+}: PropsWithChildren<FileDetailsLabelProps>) => {
+  const handleClose = (event) => {
+    onClose && onClose(event, fileName, fileId);
+  };
+  return (
+    <Label
+      className="pf-chatbot__file-label"
+      {...(onClose && { onClose: (event) => onClose(event, fileName, fileId) })}
+      closeBtn={
+        <Button
+          type="button"
+          variant="plain"
+          aria-label={closeButtonAriaLabel ?? `Close ${fileName}`}
+          icon={<TimesIcon />}
+          onClick={handleClose}
+        />
+      }
+      {...(onClick && { onClick: (event) => onClick(event, fileName, fileId) })}
+    >
+      <div className="pf-chatbot__file-label-contents">
+        <FileDetails
+          className={isLoading ? 'pf-chatbot__file-label-loading' : undefined}
+          fileName={fileName}
+          languageTestId={languageTestId}
+        />
+        {isLoading && <Spinner data-testid={spinnerTestId} size="sm" />}
+      </div>
+    </Label>
+  );
+};
 
 export default FileDetailsLabel;
diff --git a/packages/module/src/Message/Message.scss b/packages/module/src/Message/Message.scss
index f53f6b8dd..cd60c4a87 100644
--- a/packages/module/src/Message/Message.scss
+++ b/packages/module/src/Message/Message.scss
@@ -96,6 +96,14 @@
   }
 }
 
+// Attachments
+// --------------------------------------------------------------------------
+.pf-chatbot__message-attachments-container {
+  display: flex;
+  gap: var(--pf-t--global--spacer--md);
+  flex-wrap: wrap;
+}
+
 @import './MessageLoading';
 @import './CodeBlockMessage/CodeBlockMessage';
 @import './TextMessage/TextMessage';
diff --git a/packages/module/src/Message/Message.test.tsx b/packages/module/src/Message/Message.test.tsx
index 127d4922a..e31702193 100644
--- a/packages/module/src/Message/Message.test.tsx
+++ b/packages/module/src/Message/Message.test.tsx
@@ -100,13 +100,13 @@ describe('Message', () => {
     expect(screen.queryByText(`${date.toLocaleDateString()}, ${date.toLocaleTimeString()}`)).toBeFalsy();
   });
   it('should render attachments', () => {
-    render(<Message role="user" content="Hi" attachmentName="testAttachment" />);
+    render(<Message role="user" content="Hi" attachments={[{ name: 'testAttachment' }]} />);
     expect(screen.getByText('Hi')).toBeTruthy();
     expect(screen.getByText('testAttachment')).toBeTruthy();
   });
   it('should be able to click attachments', async () => {
     const spy = jest.fn();
-    render(<Message role="user" content="Hi" attachmentName="testAttachment" onAttachmentClick={spy} />);
+    render(<Message role="user" content="Hi" attachments={[{ name: 'testAttachment', onClick: spy }]} />);
     expect(screen.getByText('Hi')).toBeTruthy();
     expect(screen.getByText('testAttachment')).toBeTruthy();
     await userEvent.click(screen.getByRole('button', { name: /testAttachment/i }));
@@ -114,14 +114,12 @@ describe('Message', () => {
   });
   it('should be able to close attachments', async () => {
     const spy = jest.fn();
-    render(
-      <Message role="user" content="Hi" attachmentId="001" attachmentName="testAttachment" onAttachmentClose={spy} />
-    );
+    render(<Message role="user" content="Hi" attachments={[{ name: 'testAttachment', onClose: spy }]} />);
     expect(screen.getByText('Hi')).toBeTruthy();
     expect(screen.getByText('testAttachment')).toBeTruthy();
+    expect(screen.getByRole('button', { name: /close testAttachment/i })).toBeTruthy();
     await userEvent.click(screen.getByRole('button', { name: /close testAttachment/i }));
     expect(spy).toHaveBeenCalledTimes(1);
-    expect(spy).toHaveBeenCalledWith('001');
   });
   it('should render loading state', () => {
     render(<Message role="bot" name="Bot" content="Hi" isLoading />);
diff --git a/packages/module/src/Message/Message.tsx b/packages/module/src/Message/Message.tsx
index 6f8f07ff5..ef207e457 100644
--- a/packages/module/src/Message/Message.tsx
+++ b/packages/module/src/Message/Message.tsx
@@ -22,6 +22,25 @@ export interface QuickResponse extends Omit<LabelProps, 'children'> {
   id: string;
   onClick: () => void;
 }
+export interface MessageAttachment {
+  /** Name of file attached to the message */
+  name: string;
+  /** Unique identifier of file attached to the message */
+  id?: string | number;
+  /** Callback for when attachment label is clicked */
+  onClick?: (event: React.MouseEvent, name: string, id?: string | number) => void;
+  /** Callback for when attachment label is closed */
+  onClose?: (event: React.MouseEvent, name: string, id?: string | number) => void;
+  /** Whether file is loading */
+  isLoading?: boolean;
+  /** Aria label for attachment close button */
+  closeButtonAriaLabel?: string;
+  /** Custom test id for the language in the attachment component */
+  languageTestId?: string;
+  /** Custom test id for the loading spinner in the attachment component */
+  spinnerTestId?: string;
+}
+
 export interface MessageProps extends Omit<React.HTMLProps<HTMLDivElement>, 'role'> {
   /** Unique id for message */
   id?: string;
@@ -37,14 +56,8 @@ export interface MessageProps extends Omit<React.HTMLProps<HTMLDivElement>, 'rol
   timestamp?: string;
   /** Set this to true if message is being loaded */
   isLoading?: boolean;
-  /** Unique identifier of file attached to the message */
-  attachmentId?: string;
-  /** Name of file attached to the message */
-  attachmentName?: string;
-  /** Callback for when attachment label is clicked */
-  onAttachmentClick?: () => void;
-  /** Callback for when attachment label is closed */
-  onAttachmentClose?: (attachmentId: string) => void;
+  /** Array of attachments attached to a message */
+  attachments?: MessageAttachment[];
   /** Props for message actions, such as feedback (positive or negative), copy button, share, and listen */
   actions?: {
     [key: string]: ActionProps;
@@ -72,10 +85,6 @@ export const Message: React.FunctionComponent<MessageProps> = ({
   avatar,
   timestamp,
   isLoading,
-  attachmentId,
-  attachmentName,
-  onAttachmentClick,
-  onAttachmentClose,
   actions,
   sources,
   botWord = 'AI',
@@ -83,6 +92,7 @@ export const Message: React.FunctionComponent<MessageProps> = ({
   codeBlockProps,
   quickResponses,
   quickResponseContainerProps = { numLabels: 5 },
+  attachments,
   ...props
 }: MessageProps) => {
   // Configure default values
@@ -98,10 +108,6 @@ export const Message: React.FunctionComponent<MessageProps> = ({
     }
   };
 
-  const onClose = () => {
-    onAttachmentClose && attachmentId && onAttachmentClose(attachmentId);
-  };
-
   // Keep timestamps consistent between Timestamp component and aria-label
   const date = new Date();
   const dateString = timestamp ?? `${date.toLocaleDateString()} ${date.toLocaleTimeString()}`;
@@ -157,13 +163,22 @@ export const Message: React.FunctionComponent<MessageProps> = ({
               </LabelGroup>
             )}
           </div>
-          {attachmentName && (
-            <div className="pf-chatbot__message-attachment">
-              <FileDetailsLabel
-                fileName={attachmentName}
-                onClick={onAttachmentClick}
-                onClose={onAttachmentClose && attachmentId ? onClose : undefined}
-              />
+          {attachments && (
+            <div className="pf-chatbot__message-attachments-container">
+              {attachments.map((attachment) => (
+                <div key={attachment.id ?? attachment.name} className="pf-chatbot__message-attachment">
+                  <FileDetailsLabel
+                    fileName={attachment.name}
+                    fileId={attachment.id}
+                    onClose={attachment.onClose}
+                    onClick={attachment.onClick}
+                    isLoading={attachment.isLoading}
+                    closeButtonAriaLabel={attachment.closeButtonAriaLabel}
+                    languageTestId={attachment.languageTestId}
+                    spinnerTestId={attachment.spinnerTestId}
+                  />
+                </div>
+              ))}
             </div>
           )}
         </div>