diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.kt
index 4f726ca92..b97f9cbf3 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.kt
@@ -194,7 +194,6 @@ class ContactItem(
     }
 
     companion object {
-        const val VIEW_TYPE = FlexibleItemViewType.CONTACT_ITEM
         private const val FULLY_OPAQUE: Float = 1.0f
         private const val SEMI_TRANSPARENT: Float = 0.38f
     }
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/FlexibleItemViewType.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/FlexibleItemViewType.kt
index 656cd8d90..eaf99e297 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/FlexibleItemViewType.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/FlexibleItemViewType.kt
@@ -14,5 +14,4 @@ object FlexibleItemViewType {
     const val POLL_RESULT_HEADER_ITEM: Int = 1120391234
     const val POLL_RESULT_VOTER_ITEM: Int = 1120391235
     const val POLL_RESULT_VOTERS_OVERVIEW_ITEM: Int = 1120391236
-    const val CONTACT_ITEM: Int = 2131558687
 }
diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
index 3c50dbbfa..0c0130b32 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -163,7 +163,6 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import retrofit2.HttpException
 import java.io.File
-import java.util.Objects
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -1481,10 +1480,9 @@ class ConversationsListActivity :
     override fun onItemClick(view: View, position: Int): Boolean {
         val item = adapter?.getItem(position)
         if (item != null) {
-            when (item.itemViewType) {
-                MessageResultItem.VIEW_TYPE -> {
-                    val messageItem: MessageResultItem = item as MessageResultItem
-                    val token = messageItem.messageEntry.conversationToken
+            when (item) {
+                is MessageResultItem -> {
+                    val token = item.messageEntry.conversationToken
                     val conversationName = (
                         conversationItems.first {
                             (it is ConversationItem) && it.model.token == token
@@ -1498,27 +1496,26 @@ class ConversationsListActivity :
                             bundle.putString(BundleKeys.KEY_CREDENTIALS, credentials!!)
                             bundle.putString(BundleKeys.KEY_BASE_URL, currentUser!!.baseUrl)
                             bundle.putString(KEY_ROOM_TOKEN, token)
-                            bundle.putString(BundleKeys.KEY_MESSAGE_ID, messageItem.messageEntry.messageId)
+                            bundle.putString(BundleKeys.KEY_MESSAGE_ID, item.messageEntry.messageId)
                             bundle.putString(BundleKeys.KEY_CONVERSATION_NAME, conversationName)
                             ContextChatCompose(bundle).GetDialogView(shouldDismiss, context)
                         }
                     }
                 }
 
-                LoadMoreResultsItem.VIEW_TYPE -> {
+                is LoadMoreResultsItem -> {
                     loadMoreMessages()
                 }
 
-                ConversationItem.VIEW_TYPE -> {
-                    handleConversation((Objects.requireNonNull(item) as ConversationItem).model)
+                is ConversationItem -> {
+                    handleConversation(item.model)
                 }
 
-                ContactItem.VIEW_TYPE -> {
-                    val contact = item as ContactItem
+                is ContactItem -> {
                     contactsViewModel.createRoom(
                         ROOM_TYPE_ONE_ONE,
                         null,
-                        contact.model.actorId!!,
+                        item.model.actorId!!,
                         null
                     )
                 }
diff --git a/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt b/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt
index 7e9bae5b3..758bdfeb2 100644
--- a/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt
@@ -148,13 +148,12 @@ class MessageSearchActivity : BaseActivity() {
         adapter!!.addListener(object : FlexibleAdapter.OnItemClickListener {
             override fun onItemClick(view: View?, position: Int): Boolean {
                 val item = adapter!!.getItem(position)
-                when (item?.itemViewType) {
-                    LoadMoreResultsItem.VIEW_TYPE -> {
+                when (item) {
+                    is LoadMoreResultsItem -> {
                         viewModel.loadMore()
                     }
-                    MessageResultItem.VIEW_TYPE -> {
-                        val messageItem = item as MessageResultItem
-                        viewModel.selectMessage(messageItem.messageEntry)
+                    is MessageResultItem -> {
+                        viewModel.selectMessage(item.messageEntry)
                     }
                 }
                 return false