diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
index ac3e2dea43..c05383de4e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
@@ -62,17 +62,10 @@ data class TimelineEvent(
     }
 
     fun getDisambiguatedDisplayName(): String {
-        val disambiguated = if (isUniqueDisplayName) {
-            senderName
-        } else {
-            senderName?.let { name ->
-                "$name (${root.senderId})"
-            }
-        }
-        return if (disambiguated.isNullOrBlank()) {
-            root.senderId ?: ""
-        } else {
-            disambiguated
+        return when {
+            senderName.isNullOrBlank() -> root.senderId ?: ""
+            isUniqueDisplayName        -> senderName
+            else                       -> "$senderName (${root.senderId})"
         }
     }
 
@@ -107,7 +100,7 @@ fun TimelineEvent.getEditedEventId(): String? {
  * Get last MessageContent, after a possible edition
  */
 fun TimelineEvent.getLastMessageContent(): MessageContent? = annotations?.editSummary?.aggregatedContent?.toModel()
-                                                             ?: root.getClearContent().toModel()
+        ?: root.getClearContent().toModel()
 
 /**
  * Get last Message body, after a possible edition
@@ -117,7 +110,7 @@ fun TimelineEvent.getLastMessageBody(): String? {
 
     if (lastMessageContent != null) {
         return lastMessageContent.newContent?.toModel<MessageContent>()?.body
-               ?: lastMessageContent.body
+                ?: lastMessageContent.body
     }
 
     return null