diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/UserDraft.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/UserDraft.kt
index 1f2f91c0ec..073f5c0613 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/UserDraft.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/UserDraft.kt
@@ -23,11 +23,11 @@ package org.matrix.android.sdk.api.session.room.send
  * EDIT: draft of an edition of a message
  * REPLY: draft of a reply of another message
  */
-sealed class UserDraft(open val text: String) {
-    data class Regular(override val text: String) : UserDraft(text)
-    data class Quote(val linkedEventId: String, override val text: String) : UserDraft(text)
-    data class Edit(val linkedEventId: String, override val text: String) : UserDraft(text)
-    data class Reply(val linkedEventId: String, override val text: String) : UserDraft(text)
+sealed interface UserDraft {
+    data class Regular(val text: String) : UserDraft
+    data class Quote(val linkedEventId: String, val text: String) : UserDraft
+    data class Edit(val linkedEventId: String, val text: String) : UserDraft
+    data class Reply(val linkedEventId: String, val text: String) : UserDraft
 
     fun isValid(): Boolean {
         return when (this) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
index d16e6aac38..7f15b0fe17 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
@@ -29,17 +29,17 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
  *
  * Depending on the state the bottom toolbar will change (icons/preview/actions...)
  */
-sealed class SendMode(open val text: String) {
+sealed interface SendMode {
     data class Regular(
-            override val text: String,
+            val text: String,
             val fromSharing: Boolean,
             // This is necessary for forcing refresh on selectSubscribe
             private val ts: Long = System.currentTimeMillis()
-    ) : SendMode(text)
+    ) : SendMode
 
-    data class Quote(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
-    data class Edit(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
-    data class Reply(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
+    data class Quote(val timelineEvent: TimelineEvent, val text: String) : SendMode
+    data class Edit(val timelineEvent: TimelineEvent, val text: String) : SendMode
+    data class Reply(val timelineEvent: TimelineEvent, val text: String) : SendMode
 }
 
 data class MessageComposerViewState(