diff --git a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/Messages.md b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/Messages.md
index 981464fdf..493aefd92 100644
--- a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/Messages.md
+++ b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/Messages.md
@@ -30,6 +30,7 @@ propComponents:
sortValue: 3
---
+import { ArrowRightIcon, CheckCircleIcon } from '@patternfly/react-icons';
import Message from '@patternfly/chatbot/dist/dynamic/Message';
import MessageDivider from '@patternfly/chatbot/dist/dynamic/MessageDivider';
import { rehypeCodeBlockToggle } from '@patternfly/chatbot/dist/esm/Message/Plugins/rehypeCodeBlockToggle';
diff --git a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/UserMessageWithExtraContent.tsx b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/UserMessageWithExtraContent.tsx
index db5acf761..7a50ef03b 100644
--- a/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/UserMessageWithExtraContent.tsx
+++ b/packages/module/patternfly-docs/content/extensions/chatbot/examples/Messages/UserMessageWithExtraContent.tsx
@@ -1,8 +1,36 @@
-import { Fragment, FunctionComponent } from 'react';
-
+import { Fragment, FunctionComponent, useState } from 'react';
import Message from '@patternfly/chatbot/dist/dynamic/Message';
import userAvatar from './user_avatar.svg';
-import { Alert, Badge, Button, Card, CardBody, CardFooter, CardTitle } from '@patternfly/react-core';
+import {
+ Accordion,
+ AccordionContent,
+ AccordionItem,
+ AccordionToggle,
+ Alert,
+ Badge,
+ Button,
+ Card,
+ CardBody,
+ CardFooter,
+ CodeBlock,
+ DescriptionList,
+ DescriptionListDescription,
+ DescriptionListGroup,
+ DescriptionListTerm,
+ HelperText,
+ HelperTextItem,
+ Progress,
+ ProgressMeasureLocation,
+ Flex,
+ FlexItem,
+ CardTitle,
+ CardHeader,
+ CardExpandableContent,
+ Spinner,
+ CodeBlockCode
+} from '@patternfly/react-core';
+import { ArrowRightIcon, CheckCircleIcon } from '@patternfly/react-icons';
+import React from 'react';
const UserActionEndContent = () => {
// eslint-disable-next-line no-console
@@ -17,14 +45,6 @@ const UserActionEndContent = () => {
);
};
-const CardInformationAfterMainContent = () => (
-