diff --git a/packages/components/src/informative/ChatMessage/ChatMessage.js b/packages/components/src/informative/ChatMessage/ChatMessage.js
index 8d28c5231..fc3792bb1 100644
--- a/packages/components/src/informative/ChatMessage/ChatMessage.js
+++ b/packages/components/src/informative/ChatMessage/ChatMessage.js
@@ -33,7 +33,7 @@ const ChatMessage = ({
         </Box>
       ) : null}
 
-      <Box className={classes.messageBox}>
+      <Box className={showUser && !isOwn ? classes.messageBox : classes.messageBoxNoAvatar}>
         {!isOwn && showUserName && fullName && (
           <Highlight className={classes.name} highlight={highlight}>
             {fullName}
diff --git a/packages/components/src/informative/ChatMessage/ChatMessage.styles.js b/packages/components/src/informative/ChatMessage/ChatMessage.styles.js
index 24209ff14..2706612da 100644
--- a/packages/components/src/informative/ChatMessage/ChatMessage.styles.js
+++ b/packages/components/src/informative/ChatMessage/ChatMessage.styles.js
@@ -16,7 +16,7 @@ export const ChatMessageStyles = createStyles(
         background: selected ? '#E4F4E6' : 'transparent',
         display: 'flex',
         justifyContent: isOwn ? 'end' : 'start',
-        alignItems: 'end',
+        alignItems: 'start',
         gap: theme.spacing[1],
         transition: 'background 0.3s ease',
         borderRadius: '4px 2px 2px 4px',
@@ -36,6 +36,14 @@ export const ChatMessageStyles = createStyles(
         backgroundColor: '#FFFFFF',
         ...messageBox,
       },
+      messageBoxNoAvatar: {
+        marginLeft: 28,
+        padding: theme.spacing[2],
+        paddingLeft: theme.spacing[3],
+        borderRadius: '2px',
+        backgroundColor: '#FFFFFF',
+        ...messageBox,
+      },
       messageBoxInner: {
         display: 'flex',
         alignItems: 'end',