diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/RequestVerificationDMTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/RequestVerificationDMTask.kt
index 65d552940d..00b7d7320a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/RequestVerificationDMTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/RequestVerificationDMTask.kt
@@ -33,7 +33,7 @@ internal interface RequestVerificationDMTask : Task<RequestVerificationDMTask.Pa
             val cryptoService: CryptoService
     )
 
-    fun createParamsAndLocalEcho(roomId: String, from: String, methods: List<String>, to: String, cryptoService: CryptoService) : Params
+    fun createParamsAndLocalEcho(roomId: String, from: String, methods: List<String>, to: String, cryptoService: CryptoService): Params
 }
 
 internal class DefaultRequestVerificationDMTask @Inject constructor(
@@ -44,7 +44,8 @@ internal class DefaultRequestVerificationDMTask @Inject constructor(
         private val roomAPI: RoomAPI)
     : RequestVerificationDMTask {
 
-    override fun createParamsAndLocalEcho(roomId: String, from: String, methods: List<String>, to: String, cryptoService: CryptoService): RequestVerificationDMTask.Params {
+    override fun createParamsAndLocalEcho(roomId: String, from: String, methods: List<String>, to: String, cryptoService: CryptoService)
+            : RequestVerificationDMTask.Params {
         val event = localEchoEventFactory.createVerificationRequest(roomId, from, to, methods)
                 .also { localEchoEventFactory.saveLocalEcho(monarchy, it) }
         return RequestVerificationDMTask.Params(
@@ -52,6 +53,7 @@ internal class DefaultRequestVerificationDMTask @Inject constructor(
                 cryptoService
         )
     }
+
     override suspend fun execute(params: RequestVerificationDMTask.Params): SendResponse {
         val event = handleEncryption(params)
         val localID = event.eventId!!
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
index b29ed0486a..75305518d2 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
@@ -81,8 +81,6 @@ class VerificationItemFactory @Inject constructor(
         when (event.root.getClearType()) {
             EventType.KEY_VERIFICATION_CANCEL -> {
                 // Is the request referenced is actually really cancelled?
-               // if (referenceInformationData.referencesInfoData?.verificationStatus?.isCanceled() == false) return ignoredConclusion(event, highlight, callback)
-
                 val cancelContent = event.root.getClearContent().toModel<MessageVerificationCancelContent>()
                         ?: return ignoredConclusion(event, highlight, callback)
 
@@ -110,12 +108,13 @@ class VerificationItemFactory @Inject constructor(
                                 .highlighted(highlight)
                                 .leftGuideline(avatarSizeProvider.leftGuideline)
                     }
-                    else -> ignoredConclusion(event, highlight, callback)
+                    else                     -> ignoredConclusion(event, highlight, callback)
                 }
             }
-            EventType.KEY_VERIFICATION_DONE -> {
+            EventType.KEY_VERIFICATION_DONE   -> {
                 // Is the request referenced is actually really completed?
-                if (referenceInformationData.referencesInfoData?.verificationStatus != VerificationState.DONE) return ignoredConclusion(event, highlight, callback)
+                if (referenceInformationData.referencesInfoData?.verificationStatus != VerificationState.DONE)
+                    return ignoredConclusion(event, highlight, callback)
 
                 // We only tale the one sent by me
                 if (informationData.sentByMe) {