diff --git a/server/admin/app/ra/components/GroupField.tsx b/server/admin/app/ra/components/GroupField.tsx
new file mode 100644
index 00000000..145f4968
--- /dev/null
+++ b/server/admin/app/ra/components/GroupField.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { ReferenceField, ReferenceFieldProps, TextField } from 'react-admin';
+
+export const GroupField: React.FC<Omit<ReferenceFieldProps, 'reference'>> =
+  React.memo((props) => {
+    return (
+      <ReferenceField link="show" {...props} reference="groups">
+        <TextField source="name" />
+      </ReferenceField>
+    );
+  });
+GroupField.displayName = 'GroupField';
diff --git a/server/admin/app/ra/components/PostListActionToolbar.tsx b/server/admin/app/ra/components/PostListActionToolbar.tsx
new file mode 100644
index 00000000..eb9facc0
--- /dev/null
+++ b/server/admin/app/ra/components/PostListActionToolbar.tsx
@@ -0,0 +1,6 @@
+import React from 'react';
+import { Box } from '@mui/material';
+
+export const PostListActionToolbar = ({ children, ...props }) => (
+  <Box sx={{ alignItems: 'center', display: 'flex' }}>{children}</Box>
+);
diff --git a/server/admin/app/ra/resources/chat.tsx b/server/admin/app/ra/resources/chat.tsx
index 9d7f609e..1878b2fe 100644
--- a/server/admin/app/ra/resources/chat.tsx
+++ b/server/admin/app/ra/resources/chat.tsx
@@ -4,12 +4,17 @@ import {
   Datagrid,
   DateField,
   List,
-  ReferenceField,
   TextField,
   SearchInput,
   useTranslate,
   BulkDeleteButton,
+  ShowButton,
+  EditButton,
+  ReferenceInput,
+  SelectInput,
 } from 'react-admin';
+import { GroupField } from '../components/GroupField';
+import { PostListActionToolbar } from '../components/PostListActionToolbar';
 import { UserField } from '../components/UserField';
 
 export const MessageList: React.FC = () => {
@@ -24,6 +29,9 @@ export const MessageList: React.FC = () => {
           alwaysOn
           placeholder={translate('custom.users.search')}
         />,
+        <ReferenceInput key="groupID" source="groupId" reference="groups">
+          <SelectInput optionText="name" />
+        </ReferenceInput>,
       ]}
     >
       <Datagrid
@@ -33,11 +41,14 @@ export const MessageList: React.FC = () => {
         <TextField source="id" sortable={true} sortByOrder="DESC" />
         <TextField source="content" />
         <UserField source="author" />
-        <ReferenceField source="groupId" reference="groups" />
+        <GroupField source="groupId" />
         <TextField source="converseId" />
         <BooleanField source="hasRecall" />
         <TextField source="reactions" />
         <DateField source="createdAt" />
+        <PostListActionToolbar>
+          <ShowButton />
+        </PostListActionToolbar>
       </Datagrid>
     </List>
   );
diff --git a/server/admin/app/ra/resources/user.tsx b/server/admin/app/ra/resources/user.tsx
index e69e6613..4995d205 100644
--- a/server/admin/app/ra/resources/user.tsx
+++ b/server/admin/app/ra/resources/user.tsx
@@ -21,13 +21,9 @@ import {
   Labeled,
 } from 'react-admin';
 import React from 'react';
-import { Box } from '@mui/material';
 import { DangerButton } from '../components/DangerButton';
 import { ButtonWithConfirm } from '../components/ButtonWithConfirm';
-
-const PostListActionToolbar = ({ children, ...props }) => (
-  <Box sx={{ alignItems: 'center', display: 'flex' }}>{children}</Box>
-);
+import { PostListActionToolbar } from '../components/PostListActionToolbar';
 
 export const UserList: React.FC = () => {
   const translate = useTranslate();