diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/mentions/PillDisplayHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/mentions/PillDisplayHandler.kt
index b657257b85..c2b71ea15b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/mentions/PillDisplayHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/mentions/PillDisplayHandler.kt
@@ -27,6 +27,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toEveryoneInRoomMatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.api.util.toRoomAliasMatrixItem
 
 /**
  * A rich text editor [LinkDisplayHandler] and [KeywordDisplayHandler]
@@ -53,6 +54,7 @@ internal class PillDisplayHandler(
                 when {
                     room == null -> MatrixItem.RoomItem(roomId, roomId, null)
                     text == MatrixItem.NOTIFY_EVERYONE -> room.toEveryoneInRoomMatrixItem()
+                    permalink.isRoomAlias -> room.toRoomAliasMatrixItem()
                     else -> room.toMatrixItem()
                 }
             }
diff --git a/vector/src/test/java/im/vector/app/features/home/room/detail/composer/mentions/PillDisplayHandlerTest.kt b/vector/src/test/java/im/vector/app/features/home/room/detail/composer/mentions/PillDisplayHandlerTest.kt
index 61347e67fb..ee24b7a7fc 100644
--- a/vector/src/test/java/im/vector/app/features/home/room/detail/composer/mentions/PillDisplayHandlerTest.kt
+++ b/vector/src/test/java/im/vector/app/features/home/room/detail/composer/mentions/PillDisplayHandlerTest.kt
@@ -57,7 +57,10 @@ internal class PillDisplayHandlerTest {
         const val KNOWN_MATRIX_USER_NAME = "known user"
         const val CUSTOM_DOMAIN_MATRIX_ROOM_URL = "https://customdomain/#/room/$KNOWN_MATRIX_ROOM_ID"
         const val CUSTOM_DOMAIN_MATRIX_USER_URL = "https://customdomain.com/#/user/$KNOWN_MATRIX_USER_ID"
+        const val KNOWN_MATRIX_ROOM_ALIAS = "#known-alias:matrix.org"
+        const val KNOWN_MATRIX_ROOM_ALIAS_URL = "https://matrix.to/#/$KNOWN_MATRIX_ROOM_ALIAS"
     }
+    https://matrix.to/#/#rich-text-editor:matrix.org
 
     @Before
     fun setUp() {
@@ -66,6 +69,7 @@ internal class PillDisplayHandlerTest {
         every { mockGetRoom(UNKNOWN_MATRIX_ROOM_ID) } returns null
         every { mockGetRoom(KNOWN_MATRIX_ROOM_ID) } returns createFakeRoom(KNOWN_MATRIX_ROOM_ID, KNOWN_MATRIX_ROOM_NAME, KNOWN_MATRIX_ROOM_AVATAR)
         every { mockGetRoom(ROOM_ID) } returns createFakeRoom(ROOM_ID, KNOWN_MATRIX_ROOM_NAME, KNOWN_MATRIX_ROOM_AVATAR)
+        every { mockGetRoom(KNOWN_MATRIX_ROOM_ALIAS) } returns createFakeRoomWithAlias(KNOWN_MATRIX_ROOM_ALIAS, KNOWN_MATRIX_ROOM_ID, KNOWN_MATRIX_ROOM_NAME, KNOWN_MATRIX_ROOM_AVATAR)
     }
 
     @Test
@@ -175,6 +179,16 @@ internal class PillDisplayHandlerTest {
         assertEquals(MatrixItem.RoomItem(KNOWN_MATRIX_ROOM_ID, KNOWN_MATRIX_ROOM_NAME, KNOWN_MATRIX_ROOM_AVATAR), matrixItem)
     }
 
+    @Test
+    fun `when resolve known room with alias link, then it returns named custom pill`() {
+        val subject = createSubject()
+
+        val matrixItem = subject.resolveLinkDisplay("text", KNOWN_MATRIX_ROOM_ALIAS_URL)
+                .getMatrixItem()
+
+        assertEquals(MatrixItem.RoomAliasItem(KNOWN_MATRIX_ROOM_ALIAS, KNOWN_MATRIX_ROOM_NAME, KNOWN_MATRIX_ROOM_AVATAR), matrixItem)
+    }
+
     private fun TextDisplay.getMatrixItem(): MatrixItem? {
         val customSpan = this as? TextDisplay.Custom
         assertNotNull("The URL did not resolve to a custom link display method", customSpan)
@@ -206,6 +220,16 @@ internal class PillDisplayHandlerTest {
             isEncrypted = false
     )
 
+    private fun createFakeRoomWithAlias(roomAlias: String, roomId: String, roomName: String, avatarUrl: String): RoomSummary = RoomSummary(
+            roomId = roomId,
+            displayName = roomName,
+            avatarUrl = avatarUrl,
+            encryptionEventTs = null,
+            typingUsers = emptyList(),
+            isEncrypted = false,
+            canonicalAlias = roomAlias
+    )
+
     data class MatrixItemHolderSpan(
             val matrixItem: MatrixItem
     ) : ReplacementSpan() {