diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b3719669fd..40ee4ee5cf 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,6 +1,9 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="RIGHT_MARGIN" value="160" />
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
index 379eb33a9c..3b2efebc5d 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
@@ -29,6 +29,7 @@ abstract class DividerItem : VectorEpoxyModel<DividerItem.Holder>() {
     @EpoxyAttribute var color: Int = -1
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         if (color != -1) {
             holder.view.setBackgroundColor(color)
         }
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt
index 25bf2f514a..8bc266da31 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt
@@ -33,6 +33,7 @@ abstract class ErrorWithRetryItem : VectorEpoxyModel<ErrorWithRetryItem.Holder>(
     var listener: (() -> Unit)? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.textView.text = text
         holder.buttonView.isVisible = listener != null
         holder.buttonView.setOnClickListener { listener?.invoke() }
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/HelpFooterItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/HelpFooterItem.kt
index 2784db5fce..b9c06ecda8 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/HelpFooterItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/HelpFooterItem.kt
@@ -28,6 +28,7 @@ abstract class HelpFooterItem : VectorEpoxyModel<HelpFooterItem.Holder>() {
     var text: String? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.textView.text = text
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt
index 9fbd3dc4f8..beb3e91702 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt
@@ -28,6 +28,7 @@ abstract class NoResultItem : VectorEpoxyModel<NoResultItem.Holder>() {
     var text: String? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.textView.text = text
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt
index bd82f6f8fa..a1ea79cae6 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt
@@ -16,6 +16,7 @@
 
 package im.vector.riotx.core.epoxy
 
+import androidx.annotation.CallSuper
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
@@ -38,11 +39,13 @@ abstract class VectorEpoxyModel<H : VectorEpoxyHolder> : EpoxyModelWithHolder<H>
 
     private var onModelVisibilityStateChangedListener: OnVisibilityStateChangedListener? = null
 
+    @CallSuper
     override fun bind(holder: H) {
         super.bind(holder)
         lifecycleRegistry.currentState = Lifecycle.State.STARTED
     }
 
+    @CallSuper
     override fun unbind(holder: H) {
         lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
         coroutineScope.coroutineContext.cancelChildren()
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt
index c55dbdde8a..f6acbb17c0 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt
@@ -58,6 +58,7 @@ abstract class BottomSheetActionItem : VectorEpoxyModel<BottomSheetActionItem.Ho
     lateinit var listener: View.OnClickListener
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.view.setOnClickListener {
             listener.onClick(it)
         }
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
index 4c86fdc53c..26e6fddad0 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
@@ -49,6 +49,7 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
     var userClicked: (() -> Unit)? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         avatarRenderer.render(matrixItem, holder.avatar)
         holder.avatar.setOnClickListener { userClicked?.invoke() }
         holder.sender.setTextOrHide(matrixItem.displayName)
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
index aad033601d..5e1229bf2f 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
@@ -41,6 +41,7 @@ abstract class BottomSheetQuickReactionsItem : VectorEpoxyModel<BottomSheetQuick
     var listener: Listener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.textViews.forEachIndexed { index, textView ->
             textView.typeface = fontProvider.typeface ?: Typeface.DEFAULT
             textView.text = texts[index]
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
index 1c1d613f3e..0ded037f29 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
@@ -49,6 +49,7 @@ abstract class BottomSheetRoomPreviewItem : VectorEpoxyModel<BottomSheetRoomPrev
     @EpoxyAttribute var favoriteClickListener: ClickListener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         avatarRenderer.render(matrixItem, holder.avatar)
         holder.avatar.onClick(settingsClickListener)
         holder.roomName.setTextOrHide(matrixItem.displayName)
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
index 8f830ba706..df5ce4f073 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
@@ -41,6 +41,7 @@ abstract class BottomSheetSendStateItem : VectorEpoxyModel<BottomSheetSendStateI
     var drawableStart: Int = 0
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.progress.isVisible = showProgress
         holder.text.setCompoundDrawablesWithIntrinsicBounds(drawableStart, 0, 0, 0)
         holder.text.text = text
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItem.kt
index 5d9a89be34..e9f4dba7a5 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItem.kt
@@ -40,6 +40,7 @@ abstract class ProfileMatrixItem : VectorEpoxyModel<ProfileMatrixItem.Holder>()
     @EpoxyAttribute var clickListener: View.OnClickListener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         val bestName = matrixItem.getBestName()
         val matrixId = matrixItem.id.takeIf { it != bestName }
         holder.view.setOnClickListener(clickListener)
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericButtonItem.kt b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericButtonItem.kt
index c0fdb010a5..731de9a705 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericButtonItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericButtonItem.kt
@@ -47,6 +47,7 @@ abstract class GenericButtonItem : VectorEpoxyModel<GenericButtonItem.Holder>()
     var iconRes: Int? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.button.text = text
         val textColor = textColor ?: ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_primary)
         holder.button.setTextColor(textColor)
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt
index 3f1c134d5d..7d73a1949f 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt
@@ -52,6 +52,7 @@ abstract class GenericFooterItem : VectorEpoxyModel<GenericFooterItem.Holder>()
     var textColor: Int? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.text.setTextOrHide(text)
         when (style) {
             GenericItem.STYLE.BIG_TEXT    -> holder.text.textSize = 18f
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt
index fc622f4dcb..c4704d85c7 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt
@@ -74,6 +74,7 @@ abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
     var itemClickAction: Action? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.titleText.setTextOrHide(title)
 
         if (titleIconResourceId != -1) {
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemHeader.kt b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemHeader.kt
index 94b43cca88..6ab5b59fa1 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemHeader.kt
+++ b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemHeader.kt
@@ -33,6 +33,7 @@ abstract class GenericItemHeader : VectorEpoxyModel<GenericItemHeader.Holder>()
     var text: String? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.text.setTextOrHide(text)
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemWithValue.kt b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemWithValue.kt
index 37c65aa4cc..354ca8eb3f 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemWithValue.kt
+++ b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemWithValue.kt
@@ -57,6 +57,7 @@ abstract class GenericItemWithValue : VectorEpoxyModel<GenericItemWithValue.Hold
     var itemClickAction: View.OnClickListener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.titleText.setTextOrHide(title)
 
         if (titleIconResourceId != -1) {
diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericLoaderItem.kt b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericLoaderItem.kt
index 48653f889c..f43db7ef63 100644
--- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericLoaderItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericLoaderItem.kt
@@ -13,7 +13,9 @@ abstract class GenericLoaderItem : VectorEpoxyModel<GenericLoaderItem.Holder>()
 
     // Maybe/Later add some style configuration, SMALL/BIG ?
 
-    override fun bind(holder: Holder) {}
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+    }
 
     class Holder : VectorEpoxyHolder()
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewItems.kt b/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewItems.kt
index 373298bf31..7a3d022cf3 100644
--- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewItems.kt
+++ b/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewItems.kt
@@ -33,6 +33,7 @@ abstract class AttachmentPreviewItem<H : AttachmentPreviewItem.Holder> : VectorE
     abstract val attachment: ContentAttachmentData
 
     override fun bind(holder: H) {
+        super.bind(holder)
         if (attachment.type == ContentAttachmentData.Type.VIDEO || attachment.type == ContentAttachmentData.Type.IMAGE) {
             Glide.with(holder.view.context)
                     .asBitmap()
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteMatrixItem.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteMatrixItem.kt
index d5eb90a62c..fbfffc7652 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteMatrixItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteMatrixItem.kt
@@ -37,6 +37,7 @@ abstract class AutocompleteMatrixItem : VectorEpoxyModel<AutocompleteMatrixItem.
     @EpoxyAttribute var clickListener: View.OnClickListener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.view.setOnClickListener(clickListener)
         holder.nameView.text = matrixItem.getBestName()
         holder.subNameView.setTextOrHide(subName)
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt
index 85ef2d2bc1..eaac9c6c5c 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt
@@ -37,6 +37,7 @@ abstract class AutocompleteCommandItem : VectorEpoxyModel<AutocompleteCommandIte
     var clickListener: View.OnClickListener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.view.setOnClickListener(clickListener)
 
         holder.nameView.text = name
diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiItem.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiItem.kt
index 36759f9271..76573929cc 100644
--- a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiItem.kt
@@ -40,6 +40,7 @@ abstract class AutocompleteEmojiItem : VectorEpoxyModel<AutocompleteEmojiItem.Ho
     var onClickListener: ReactionClickListener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.emojiText.text = emojiItem.emoji
         holder.emojiText.typeface = emojiTypeFace ?: Typeface.DEFAULT
         holder.emojiNameText.text = emojiItem.name
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
index d52c27d1f1..ca509a11f2 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
@@ -42,6 +42,7 @@ abstract class KeysBackupSettingFooterItem : VectorEpoxyModel<KeysBackupSettingF
     var clickOnButton2: View.OnClickListener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.button1.setTextOrHide(textButton1)
         holder.button1.setOnClickListener(clickOnButton1)
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt
index a6b3459701..f07fce98b0 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt
@@ -51,6 +51,7 @@ abstract class BottomSheetVerificationActionItem : VectorEpoxyModel<BottomSheetV
     lateinit var listener: () -> Unit
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.view.setOnClickListener {
             listener.invoke()
         }
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt
index 5163f5e8a8..c806778c3a 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt
@@ -37,6 +37,7 @@ abstract class BottomSheetVerificationBigImageItem : VectorEpoxyModel<BottomShee
     var contentDescription: String? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.image.setImageResource(imageRes)
 
         if (contentDescription == null) {
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt
index 8d08ef0ba7..1681bf0db8 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt
@@ -33,6 +33,7 @@ abstract class BottomSheetVerificationDecimalCodeItem : VectorEpoxyModel<BottomS
     var code: CharSequence = ""
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.code.text = code
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
index be14c7df3d..112c26e69a 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
@@ -47,6 +47,7 @@ abstract class BottomSheetVerificationEmojisItem : VectorEpoxyModel<BottomSheetV
     @EpoxyAttribute lateinit var emojiRepresentation6: EmojiRepresentation
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         bindEmojiView(holder.emoji0View, emojiRepresentation0)
         bindEmojiView(holder.emoji1View, emojiRepresentation1)
         bindEmojiView(holder.emoji2View, emojiRepresentation2)
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt
index b5314d4869..c21410b7eb 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt
@@ -33,6 +33,7 @@ abstract class BottomSheetVerificationNoticeItem : VectorEpoxyModel<BottomSheetV
     var notice: CharSequence = ""
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.notice.text = notice
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
index dc126bc460..024321b6dc 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
@@ -36,6 +36,7 @@ abstract class BottomSheetVerificationQrCodeItem : VectorEpoxyModel<BottomSheetV
     var animate = false
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.qsrCodeImage.setData(data, animate)
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt
index 2af5ef418f..32ad4e77c6 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt
@@ -33,6 +33,7 @@ abstract class BottomSheetVerificationWaitingItem : VectorEpoxyModel<BottomSheet
     var title: CharSequence = ""
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.title.text = title
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsItem.kt b/vector/src/main/java/im/vector/riotx/features/discovery/SettingsItem.kt
index 4b6e4b3edf..e11ae68f18 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/discovery/SettingsItem.kt
@@ -48,6 +48,7 @@ abstract class SettingsItem : EpoxyModelWithHolder<SettingsItem.Holder>() {
     var itemClickListener: View.OnClickListener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         if (titleResId != null) {
             holder.titleText.setText(titleResId!!)
         } else {
diff --git a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt
index 3b4530f645..d31d2cca7e 100644
--- a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt
@@ -48,6 +48,7 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     }
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.hint = hint
 
diff --git a/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt b/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt
index 1f3c7c81bb..9f2c04eec5 100644
--- a/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt
@@ -44,6 +44,7 @@ abstract class FormSwitchItem : VectorEpoxyModel<FormSwitchItem.Holder>() {
     var summary: String? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.view.setOnClickListener {
             if (enabled) {
                 holder.switchView.toggle()
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt
index 589be112dc..45e5fbfc6a 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt
@@ -36,6 +36,7 @@ abstract class DisplayReadReceiptItem : EpoxyModelWithHolder<DisplayReadReceiptI
     @EpoxyAttribute var userClicked: (() -> Unit)? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         avatarRenderer.render(matrixItem, holder.avatarView)
         holder.displayNameView.text = matrixItem.getBestName()
         timestamp?.let {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt
index 9847afcdcc..4b36478586 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt
@@ -29,6 +29,7 @@ abstract class DaySeparatorItem : EpoxyModelWithHolder<DaySeparatorItem.Holder>(
     @EpoxyAttribute lateinit var formattedDay: CharSequence
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.dayTextView.text = formattedDay
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RoomCreateItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RoomCreateItem.kt
index abe1d88dbd..5f6c0aedfa 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RoomCreateItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RoomCreateItem.kt
@@ -30,6 +30,7 @@ abstract class RoomCreateItem : VectorEpoxyModel<RoomCreateItem.Holder>() {
     @EpoxyAttribute lateinit var text: CharSequence
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.description.movementMethod = BetterLinkMovementMethod.getInstance()
         holder.description.text = text
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt
index 4d867156d3..0fa6e6fef6 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt
@@ -24,8 +24,6 @@ import im.vector.riotx.core.epoxy.VectorEpoxyModel
 @EpoxyModelClass(layout = R.layout.item_timeline_read_marker)
 abstract class TimelineReadMarkerItem : VectorEpoxyModel<TimelineReadMarkerItem.Holder>() {
 
-    override fun bind(holder: Holder) {
-    }
-
     class Holder : VectorEpoxyHolder()
+
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt
index 71855bfaf8..3e1bbfb783 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt
@@ -40,6 +40,7 @@ abstract class ReactionInfoSimpleItem : EpoxyModelWithHolder<ReactionInfoSimpleI
     var userClicked: (() -> Unit)? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.emojiReactionView.text = reactionKey
         holder.displayNameView.text = authorDisplayName
         timeStamp?.let {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetItem.kt
index 8b7d32bb99..7cdc033157 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetItem.kt
@@ -33,6 +33,7 @@ abstract class RoomWidgetItem : EpoxyModelWithHolder<RoomWidgetItem.Holder>() {
     @EpoxyAttribute var widgetClicked: ClickListener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.widgetName.text = widget.name
         holder.view.onClick(widgetClicked)
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomFooterItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomFooterItem.kt
index ece3e089e0..60b672cef2 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomFooterItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomFooterItem.kt
@@ -34,6 +34,7 @@ abstract class FilteredRoomFooterItem : VectorEpoxyModel<FilteredRoomFooterItem.
     var currentFilter: String = ""
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.createRoomButton.setOnClickListener { listener?.createRoom(currentFilter) }
         holder.createDirectChat.setOnClickListener { listener?.createDirectChat() }
         holder.openRoomDirectory.setOnClickListener { listener?.openRoomDirectory(currentFilter) }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt
index 130de7278c..0c4ae4d61d 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt
@@ -37,6 +37,7 @@ abstract class RoomCategoryItem : VectorEpoxyModel<RoomCategoryItem.Holder>() {
     @EpoxyAttribute var listener: (() -> Unit)? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         val tintColor = ThemeUtils.getColor(holder.rootView.context, R.attr.riotx_text_secondary)
         val expandedArrowDrawableRes = if (expanded) R.drawable.ic_expand_more_white else R.drawable.ic_expand_less_white
         val expandedArrowDrawable = ContextCompat.getDrawable(holder.rootView.context, expandedArrowDrawableRes)?.also {
diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyItem.kt b/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyItem.kt
index 9931d33068..50e92488a1 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyItem.kt
@@ -44,6 +44,7 @@ abstract class PolicyItem : EpoxyModelWithHolder<PolicyItem.Holder>() {
     var clickListener: View.OnClickListener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.let {
             it.checkbox.isChecked = checked
             it.checkbox.setOnCheckedChangeListener(checkChangeListener)
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt
index 108627e3f8..aa533857e0 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt
@@ -57,6 +57,7 @@ abstract class PublicRoomItem : VectorEpoxyModel<PublicRoomItem.Holder>() {
     var joinListener: (() -> Unit)? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.rootView.setOnClickListener { globalListener?.invoke() }
 
         avatarRenderer.render(matrixItem, holder.avatarView)
diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt
index 3dddec1fb7..334def592a 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt
@@ -46,6 +46,7 @@ abstract class RoomDirectoryItem : VectorEpoxyModel<RoomDirectoryItem.Holder>()
     var globalListener: (() -> Unit)? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.rootView.setOnClickListener { globalListener?.invoke() }
 
         // Avatar
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceItem.kt b/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceItem.kt
index 5802bebf39..0f58360dbd 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceItem.kt
@@ -73,6 +73,7 @@ abstract class DeviceItem : VectorEpoxyModel<DeviceItem.Holder>() {
     var dimensionConverter: DimensionConverter? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.root.setOnClickListener { itemClickAction?.invoke() }
 
         val shield = TrustUtils.shieldForTrust(
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/ignored/UserItem.kt b/vector/src/main/java/im/vector/riotx/features/settings/ignored/UserItem.kt
index 23fb03d59a..7182dd0bda 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/ignored/UserItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/ignored/UserItem.kt
@@ -43,6 +43,7 @@ abstract class UserItem : VectorEpoxyModel<UserItem.Holder>() {
     var itemClickAction: (() -> Unit)? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.root.setOnClickListener { itemClickAction?.invoke() }
 
         avatarRenderer.render(matrixItem, holder.avatarImage)
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt
index 9dfca069ec..6873330271 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt
@@ -31,6 +31,7 @@ abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>()
     lateinit var pusher: Pusher
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.kind.text = when (pusher.kind) {
             // TODO Create const
             "http" -> "Http Pusher"
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt
index bdd1df4667..b00159d1e2 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt
@@ -41,6 +41,7 @@ abstract class PushRuleItem : EpoxyModelWithHolder<PushRuleItem.Holder>() {
     // TODO i18n
     @SuppressLint("SetTextI18n")
     override fun bind(holder: Holder) {
+        super.bind(holder)
         val context = holder.view.context
         if (pushRule.enabled) {
             holder.view.setBackgroundColor(Color.TRANSPARENT)
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt b/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt
index 47651cf61b..593695bbd6 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt
@@ -34,6 +34,7 @@ abstract class LoginErrorWithRetryItem : VectorEpoxyModel<LoginErrorWithRetryIte
     var listener: (() -> Unit)? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.textView.text = text
         holder.buttonView.setOnClickListener { listener?.invoke() }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/terms/TermItem.kt b/vector/src/main/java/im/vector/riotx/features/terms/TermItem.kt
index d0081d6cd6..91be50d2b8 100644
--- a/vector/src/main/java/im/vector/riotx/features/terms/TermItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/terms/TermItem.kt
@@ -45,6 +45,7 @@ abstract class TermItem : EpoxyModelWithHolder<TermItem.Holder>() {
     var clickListener: View.OnClickListener? = null
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.checkbox.isChecked = checked
         holder.title.text = name
         holder.description.text = description
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryLetterHeaderItem.kt b/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryLetterHeaderItem.kt
index e7e9183ada..5fa490b0d7 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryLetterHeaderItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryLetterHeaderItem.kt
@@ -29,6 +29,7 @@ abstract class UserDirectoryLetterHeaderItem : VectorEpoxyModel<UserDirectoryLet
     @EpoxyAttribute var letter: String = ""
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.letterView.text = letter
     }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryUserItem.kt b/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryUserItem.kt
index 7ea0709ce8..86d240eb02 100644
--- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryUserItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryUserItem.kt
@@ -38,6 +38,7 @@ abstract class UserDirectoryUserItem : VectorEpoxyModel<UserDirectoryUserItem.Ho
     @EpoxyAttribute var selected: Boolean = false
 
     override fun bind(holder: Holder) {
+        super.bind(holder)
         holder.view.setOnClickListener(clickListener)
         // If name is empty, use userId as name and force it being centered
         if (matrixItem.displayName.isNullOrEmpty()) {