diff --git a/CHANGES.md b/CHANGES.md
index fbd38522..7cffa1ff 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements:
  - Improve long tap menu: reply on top, more compact (#368)
  - Quick reply in timeline with swipe gesture (#167)
  - Improve edit of replies
+ - Improve performance on Room Members and Users management (#381)
 
 Other changes:
  - migrate from rxbinding 2 to rxbinding 3
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomDisplayNameResolver.kt
index c27b0a74..b6b7c3e1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -90,7 +90,9 @@ internal class RoomDisplayNameResolver @Inject constructor(private val context:
                 val inviteMeEvent = roomMembers.queryRoomMemberEvent(credentials.userId).findFirst()
                 val inviterId = inviteMeEvent?.sender
                 name = if (inviterId != null) {
-                    val inviterMemberEvent = loadedMembers.where().equalTo(EventEntityFields.STATE_KEY, inviterId).findFirst()
+                    val inviterMemberEvent = loadedMembers.where()
+                            .equalTo(EventEntityFields.STATE_KEY, inviterId)
+                            .findFirst()
                     inviterMemberEvent?.toRoomMember()?.displayName
                 } else {
                     context.getString(R.string.room_displayname_room_invite)