diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b491ee..f5cad31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Version 0.4.0 - 2020-MM-DD
 ### New features
+- Avatars with name letters
+- Calc username colors
 ### Fixes
 
 # Version 0.3.0 - 2020-01-17
diff --git a/lib/views/chat.dart b/lib/views/chat.dart
index c4c7a6a..6a0beae 100644
--- a/lib/views/chat.dart
+++ b/lib/views/chat.dart
@@ -164,7 +164,10 @@ class _ChatState extends State<Chat> {
     typingUsers.removeWhere((User u) => u.id == client.userID);
 
     if (typingUsers.length == 1) {
-      typingText = "${typingUsers.first.calcDisplayname()} is typing...";
+      typingText = "is typing...";
+      if (typingUsers.first.id != room.directChatMatrixID) {
+        typingText = typingUsers.first.calcDisplayname() + " " + typingText;
+      }
     } else if (typingUsers.length == 2) {
       typingText =
           "${typingUsers.first.calcDisplayname()} and ${typingUsers[1].calcDisplayname()} are typing...";
diff --git a/lib/views/chat_details.dart b/lib/views/chat_details.dart
index 568266f..3311d39 100644
--- a/lib/views/chat_details.dart
+++ b/lib/views/chat_details.dart
@@ -214,7 +214,7 @@ class _ChatDetailsState extends State<ChatDetails> {
                         : Container(),
                   ],
                 )
-              : i < members.length + 1 && false
+              : i < members.length + 1
                   ? ParticipantListItem(members[i - 1])
                   : ListTile(
                       title: Text(