diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab405fd0..7acc585b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Improve: Show delivery and read receipt indicators for text messages
 - Improve: Backup screen clearer and easier to understand
+- Improve: Show username above messages in group chats
 - Fix: Background audio correctly pauses and resumes when viewing videos
 
 ## 0.5.0
diff --git a/lib/src/visual/views/chats/chat_messages_components/chat_list_entry.dart b/lib/src/visual/views/chats/chat_messages_components/chat_list_entry.dart
index d076c4c5..7be02cfd 100644
--- a/lib/src/visual/views/chats/chat_messages_components/chat_list_entry.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/chat_list_entry.dart
@@ -11,6 +11,7 @@ import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/memory_item.model.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/utils/log.dart';
+import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
 import 'package:twonly/src/visual/views/chats/chat_messages_components/chat_reaction_row.dart';
 import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/chat_ask_a_friend.entry.dart';
@@ -202,7 +203,22 @@ class _ChatListEntryState extends State<ChatListEntry> {
           )
         else
           Column(
+            crossAxisAlignment: right
+                ? CrossAxisAlignment.end
+                : CrossAxisAlignment.start,
             children: [
+              if (info.displayUserName != '' && !widget.group.isDirectChat)
+                Padding(
+                  padding: const EdgeInsets.only(bottom: 2, left: 4),
+                  child: Text(
+                    info.displayUserName,
+                    style: TextStyle(
+                      color: context.color.onSurfaceVariant,
+                      fontWeight: FontWeight.w600,
+                      fontSize: 13,
+                    ),
+                  ),
+                ),
               ResponseContainer(
                 msg: widget.message,
                 group: widget.group,
diff --git a/lib/src/visual/views/chats/chat_messages_components/entries/chat_text_entry.dart b/lib/src/visual/views/chats/chat_messages_components/entries/chat_text_entry.dart
index 694f3581..35d46979 100644
--- a/lib/src/visual/views/chats/chat_messages_components/entries/chat_text_entry.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/entries/chat_text_entry.dart
@@ -51,18 +51,6 @@ class ChatTextEntry extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisSize: MainAxisSize.min,
           children: [
-            if (info.displayUserName != '')
-              Padding(
-                padding: const EdgeInsets.only(bottom: 2),
-                child: Text(
-                  info.displayUserName,
-                  textAlign: TextAlign.left,
-                  style: const TextStyle(
-                    color: Colors.white,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
             Row(
               mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.end,