diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
index 00b1b98f6..677dd22f6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
@@ -221,14 +221,12 @@ class ConversationViewModel(
     }
 
     fun hidesInputBar(): Boolean = openGroup?.canWrite != true &&
-                blindedRecipient?.blocksCommunityMessageRequests == true
+        blindedRecipient?.blocksCommunityMessageRequests == true
 
-    fun legacyBannerRecipient(context: Context): Recipient? = recipient?.let { recipient ->
-        val legacyAddress = storage.getLastLegacyRecipient(recipient.address.serialize()) ?: return@let null
-        return Recipient.from(context, Address.fromSerialized(legacyAddress), false)
+    fun legacyBannerRecipient(context: Context): Recipient? = recipient?.run {
+        storage.getLastLegacyRecipient(address.serialize())?.let { Recipient.from(context, Address.fromSerialized(it), false) }
     }
 
-
     @dagger.assisted.AssistedFactory
     interface AssistedFactory {
         fun create(threadId: Long, edKeyPair: KeyPair?): Factory