diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationStartContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationStartContent.kt
index 7d77a34e27..f928e21a82 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationStartContent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationStartContent.kt
@@ -38,7 +38,7 @@ internal data class MessageVerificationStartContent(
 ) : VerificationInfoStart {
 
     override fun toCanonicalJson(): String? {
-       return JsonCanonicalizer.getCanonicalJson(MessageVerificationStartContent::class.java, this)
+        return JsonCanonicalizer.getCanonicalJson(MessageVerificationStartContent::class.java, this)
     }
 
     override val transactionID: String?
@@ -46,9 +46,14 @@ internal data class MessageVerificationStartContent(
 
     override fun isValid(): Boolean {
         if (
-                (transactionID.isNullOrBlank() || fromDevice.isNullOrBlank() || method != KeyVerificationStart.VERIF_METHOD_SAS || keyAgreementProtocols.isNullOrEmpty() || hashes.isNullOrEmpty())
+                (transactionID.isNullOrBlank()
+                        || fromDevice.isNullOrBlank()
+                        || method != KeyVerificationStart.VERIF_METHOD_SAS
+                        || keyAgreementProtocols.isNullOrEmpty()
+                        || hashes.isNullOrEmpty())
                 || !hashes.contains("sha256") || messageAuthenticationCodes.isNullOrEmpty()
-                || (!messageAuthenticationCodes.contains(SASVerificationTransaction.SAS_MAC_SHA256) && !messageAuthenticationCodes.contains(SASVerificationTransaction.SAS_MAC_SHA256_LONGKDF))
+                || (!messageAuthenticationCodes.contains(SASVerificationTransaction.SAS_MAC_SHA256)
+                        && !messageAuthenticationCodes.contains(SASVerificationTransaction.SAS_MAC_SHA256_LONGKDF))
                 || shortAuthenticationStrings.isNullOrEmpty()
                 || !shortAuthenticationStrings.contains(SasMode.DECIMAL)) {
             Timber.e("## received invalid verification request")
@@ -57,5 +62,5 @@ internal data class MessageVerificationStartContent(
         return true
     }
 
-    override fun toEventContent()  = this.toContent()
+    override fun toEventContent() = this.toContent()
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SasTransportRoomMessage.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SasTransportRoomMessage.kt
index fda411af39..87bb4bc805 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SasTransportRoomMessage.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SasTransportRoomMessage.kt
@@ -41,7 +41,11 @@ internal class SasTransportRoomMessage(
         private val taskExecutor: TaskExecutor
 ) : SasTransport {
 
-    override fun sendToOther(type: String, verificationInfo: VerificationInfo, nextState: SasVerificationTxState, onErrorReason: CancelCode, onDone: (() -> Unit)?) {
+    override fun sendToOther(type: String,
+                             verificationInfo: VerificationInfo,
+                             nextState: SasVerificationTxState,
+                             onErrorReason: CancelCode,
+                             onDone: (() -> Unit)?) {
         Timber.d("## SAS sending msg type $type")
         Timber.v("## SAS sending msg info $verificationInfo")
         sendVerificationMessageTask.configureWith(
@@ -109,7 +113,14 @@ internal class SasTransportRoomMessage(
                               commitment: String,
                               messageAuthenticationCode: String,
                               shortAuthenticationStrings: List<String>)
-            : VerificationInfoAccept = MessageVerificationAcceptContent.create(tid, keyAgreementProtocol, hash, commitment, messageAuthenticationCode, shortAuthenticationStrings)
+            : VerificationInfoAccept = MessageVerificationAcceptContent.create(
+            tid,
+            keyAgreementProtocol,
+            hash,
+            commitment,
+            messageAuthenticationCode,
+            shortAuthenticationStrings
+    )
 
     override fun createKey(tid: String, pubKey: String): VerificationInfoKey = MessageVerificationKeyContent.create(tid, pubKey)
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SasTransportToDevice.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SasTransportToDevice.kt
index 0e1459a920..96ae47895e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SasTransportToDevice.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SasTransportToDevice.kt
@@ -36,7 +36,11 @@ internal class SasTransportToDevice(
         private var taskExecutor: TaskExecutor
 ) : SasTransport {
 
-    override fun sendToOther(type: String, verificationInfo: VerificationInfo, nextState: SasVerificationTxState, onErrorReason: CancelCode, onDone: (() -> Unit)?) {
+    override fun sendToOther(type: String,
+                             verificationInfo: VerificationInfo,
+                             nextState: SasVerificationTxState,
+                             onErrorReason: CancelCode,
+                             onDone: (() -> Unit)?) {
         Timber.d("## SAS sending msg type $type")
         Timber.v("## SAS sending msg info $verificationInfo")
         val tx = tx ?: return
@@ -98,7 +102,13 @@ internal class SasTransportToDevice(
                               commitment: String,
                               messageAuthenticationCode: String,
                               shortAuthenticationStrings: List<String>)
-            : VerificationInfoAccept = KeyVerificationAccept.create(tid, keyAgreementProtocol, hash, commitment, messageAuthenticationCode, shortAuthenticationStrings)
+            : VerificationInfoAccept = KeyVerificationAccept.create(
+            tid,
+            keyAgreementProtocol,
+            hash,
+            commitment,
+            messageAuthenticationCode,
+            shortAuthenticationStrings)
 
     override fun createKey(tid: String, pubKey: String): VerificationInfoKey = KeyVerificationKey.create(tid, pubKey)