diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/UserMentionSpan.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/UserMentionSpan.kt
index 0899e4f27e..4cd8080dc3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/UserMentionSpan.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/send/UserMentionSpan.kt
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package im.vector.matrix.android.api.session.room.send
 
 /**
@@ -20,6 +21,6 @@ package im.vector.matrix.android.api.session.room.send
  * These Spans will be transformed into pills when detected in message to send
  */
 interface UserMentionSpan {
-    abstract val displayName: String
-    abstract val userId: String
+    val displayName: String
+    val userId: String
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt
index f3a29b8dc0..593ce1a8f6 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt
@@ -87,11 +87,8 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib
         }
 
         sendButton.setOnClickListener {
-            val textMessage = text?.toSpannable()
-            callback?.onSendMessage(
-                    textMessage
-                            ?: ""
-            )
+            val textMessage = text?.toSpannable() ?: ""
+            callback?.onSendMessage(textMessage)
         }
 
         attachmentButton.setOnClickListener {