diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
index 19305c2e5..40c04f508 100644
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
@@ -16,7 +16,6 @@ import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.onboarding.*
 import chat.simplex.common.platform.*
-import chat.simplex.res.MR
 import kotlinx.coroutines.*
 import java.lang.ref.WeakReference
 
@@ -143,7 +142,7 @@ fun processExternalIntent(intent: Intent?) {
           val text = intent.getStringExtra(Intent.EXTRA_TEXT)
           val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
           if (uri != null) {
-            if (uri.scheme != "content") return showNonContentUriAlert()
+            if (uri.scheme != "content") return showWrongUriAlert()
             // Shared file that contains plain text, like `*.log` file
             chatModel.sharedContent.value = SharedContent.File(text ?: "", uri.toURI())
           } else if (text != null) {
@@ -154,14 +153,14 @@ fun processExternalIntent(intent: Intent?) {
         isMediaIntent(intent) -> {
           val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
           if (uri != null) {
-            if (uri.scheme != "content") return showNonContentUriAlert()
+            if (uri.scheme != "content") return showWrongUriAlert()
             chatModel.sharedContent.value = SharedContent.Media(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", listOf(uri.toURI()))
           } // All other mime types
         }
         else -> {
           val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
           if (uri != null) {
-            if (uri.scheme != "content") return showNonContentUriAlert()
+            if (uri.scheme != "content") return showWrongUriAlert()
             chatModel.sharedContent.value = SharedContent.File(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", uri.toURI())
           }
         }
@@ -176,7 +175,7 @@ fun processExternalIntent(intent: Intent?) {
         isMediaIntent(intent) -> {
           val uris = intent.getParcelableArrayListExtra<Parcelable>(Intent.EXTRA_STREAM) as? List<Uri>
           if (uris != null) {
-            if (uris.any { it.scheme != "content" }) return showNonContentUriAlert()
+            if (uris.any { it.scheme != "content" }) return showWrongUriAlert()
             chatModel.sharedContent.value = SharedContent.Media(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", uris.map { it.toURI() })
           } // All other mime types
         }
@@ -189,13 +188,6 @@ fun processExternalIntent(intent: Intent?) {
 fun isMediaIntent(intent: Intent): Boolean =
   intent.type?.startsWith("image/") == true || intent.type?.startsWith("video/") == true
 
-private fun showNonContentUriAlert() {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(MR.strings.non_content_uri_alert_title),
-    text = generalGetString(MR.strings.non_content_uri_alert_text)
-  )
-}
-
 //fun testJson() {
 //  val str: String = """
 //  """.trimIndent()
diff --git a/apps/multiplatform/build.gradle.kts b/apps/multiplatform/build.gradle.kts
index 9d6fd0c20..f40420752 100644
--- a/apps/multiplatform/build.gradle.kts
+++ b/apps/multiplatform/build.gradle.kts
@@ -45,7 +45,6 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle:${rootProject.extra["gradle.plugin.version"]}")
         classpath(kotlin("gradle-plugin", version = rootProject.extra["kotlin.version"] as String))
-        classpath("org.jetbrains.kotlin:kotlin-serialization:1.3.2")
         classpath("dev.icerock.moko:resources-generator:0.23.0")
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Share.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Share.android.kt
index a370bbf40..cf3fcbaae 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Share.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Share.android.kt
@@ -36,7 +36,7 @@ actual fun shareFile(text: String, fileSource: CryptoFile) {
     tmpFile.deleteOnExit()
     ChatModel.filesToDelete.add(tmpFile)
     decryptCryptoFile(getAppFilePath(fileSource.filePath), fileSource.cryptoArgs, tmpFile.absolutePath)
-    FileProvider.getUriForFile(androidAppContext, "$APPLICATION_ID.provider", File(tmpFile.absolutePath)).toURI()
+    getAppFileUri(tmpFile.absolutePath)
   } else {
     getAppFileUri(fileSource.filePath)
   }
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/VideoPlayer.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/VideoPlayer.android.kt
index 9d5eadad7..574b756bb 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/VideoPlayer.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/VideoPlayer.android.kt
@@ -200,7 +200,7 @@ actual class VideoPlayer actual constructor(
   private fun setPreviewAndDuration() {
     // It freezes main thread, doing it in IO thread
     CoroutineScope(Dispatchers.IO).launch {
-      val previewAndDuration = VideoPlayerHolder.previewsAndDurations.getOrPut(uri) { getBitmapFromVideo(uri) }
+      val previewAndDuration = VideoPlayerHolder.previewsAndDurations.getOrPut(uri) { getBitmapFromVideo(uri, withAlertOnException = false) }
       withContext(Dispatchers.Main) {
         preview.value = previewAndDuration.preview ?: defaultPreview
         duration.value = (previewAndDuration.duration ?: 0)
diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/helpers/Utils.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/helpers/Utils.android.kt
index 127f13cd5..8b98b0542 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/helpers/Utils.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/helpers/Utils.android.kt
@@ -152,7 +152,7 @@ private fun spannableStringToAnnotatedString(
 }
 
 actual fun getAppFileUri(fileName: String): URI =
-  FileProvider.getUriForFile(androidAppContext, "$APPLICATION_ID.provider", File(getAppFilePath(fileName))).toURI()
+  FileProvider.getUriForFile(androidAppContext, "$APPLICATION_ID.provider", if (File(fileName).isAbsolute) File(fileName) else File(getAppFilePath(fileName))).toURI()
 
 // https://developer.android.com/training/data-storage/shared/documents-files#bitmap
 actual fun getLoadedImage(file: CIFile?): Pair<ImageBitmap, ByteArray>? {
@@ -233,17 +233,13 @@ actual fun getFileSize(uri: URI): Long? {
 
 actual fun getBitmapFromUri(uri: URI, withAlertOnException: Boolean): ImageBitmap? {
   return if (Build.VERSION.SDK_INT >= 28) {
-    val source = ImageDecoder.createSource(androidAppContext.contentResolver, uri.toUri())
     try {
+      val source = ImageDecoder.createSource(androidAppContext.contentResolver, uri.toUri())
       ImageDecoder.decodeBitmap(source)
-    } catch (e: android.graphics.ImageDecoder.DecodeException) {
+    } catch (e: Exception) {
       Log.e(TAG, "Unable to decode the image: ${e.stackTraceToString()}")
-      if (withAlertOnException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(MR.strings.image_decoding_exception_title),
-          text = generalGetString(MR.strings.image_decoding_exception_desc)
-        )
-      }
+      if (withAlertOnException) showImageDecodingException()
+
       null
     }
   } else {
@@ -253,17 +249,13 @@ actual fun getBitmapFromUri(uri: URI, withAlertOnException: Boolean): ImageBitma
 
 actual fun getBitmapFromByteArray(data: ByteArray, withAlertOnException: Boolean): ImageBitmap? {
   return if (Build.VERSION.SDK_INT >= 31) {
-    val source = ImageDecoder.createSource(data)
     try {
+      val source = ImageDecoder.createSource(data)
       ImageDecoder.decodeBitmap(source)
     } catch (e: android.graphics.ImageDecoder.DecodeException) {
       Log.e(TAG, "Unable to decode the image: ${e.stackTraceToString()}")
-      if (withAlertOnException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(MR.strings.image_decoding_exception_title),
-          text = generalGetString(MR.strings.image_decoding_exception_desc)
-        )
-      }
+      if (withAlertOnException) showImageDecodingException()
+
       null
     }
   } else {
@@ -273,17 +265,13 @@ actual fun getBitmapFromByteArray(data: ByteArray, withAlertOnException: Boolean
 
 actual fun getDrawableFromUri(uri: URI, withAlertOnException: Boolean): Any? {
   return if (Build.VERSION.SDK_INT >= 28) {
-    val source = ImageDecoder.createSource(androidAppContext.contentResolver, uri.toUri())
     try {
+      val source = ImageDecoder.createSource(androidAppContext.contentResolver, uri.toUri())
       ImageDecoder.decodeDrawable(source)
-    } catch (e: android.graphics.ImageDecoder.DecodeException) {
-      if (withAlertOnException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(MR.strings.image_decoding_exception_title),
-          text = generalGetString(MR.strings.image_decoding_exception_desc)
-        )
-      }
+    } catch (e: Exception) {
       Log.e(TAG, "Error while decoding drawable: ${e.stackTraceToString()}")
+      if (withAlertOnException) showImageDecodingException()
+
       null
     }
   } else {
@@ -304,23 +292,29 @@ actual suspend fun saveTempImageUncompressed(image: ImageBitmap, asPng: Boolean)
       ChatModel.filesToDelete.add(this)
     }
   } catch (e: Exception) {
-    Log.e(TAG, "Util.kt saveTempImageUncompressed error: ${e.message}")
+    Log.e(TAG, "Utils.android saveTempImageUncompressed error: ${e.message}")
     null
   }
 }
 
-actual suspend fun getBitmapFromVideo(uri: URI, timestamp: Long?, random: Boolean): VideoPlayerInterface.PreviewAndDuration {
-  val mmr = MediaMetadataRetriever()
-  mmr.setDataSource(androidAppContext, uri.toUri())
-  val durationMs = mmr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong()
-  val image = when {
-    timestamp != null -> mmr.getFrameAtTime(timestamp * 1000, MediaMetadataRetriever.OPTION_CLOSEST)
-    random -> mmr.frameAtTime
-    else -> mmr.getFrameAtTime(0)
+actual suspend fun getBitmapFromVideo(uri: URI, timestamp: Long?, random: Boolean, withAlertOnException: Boolean): VideoPlayerInterface.PreviewAndDuration =
+  try {
+    val mmr = MediaMetadataRetriever()
+    mmr.setDataSource(androidAppContext, uri.toUri())
+    val durationMs = mmr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong()
+    val image = when {
+      timestamp != null -> mmr.getFrameAtTime(timestamp * 1000, MediaMetadataRetriever.OPTION_CLOSEST)
+      random -> mmr.frameAtTime
+      else -> mmr.getFrameAtTime(0)
+    }
+    mmr.release()
+    VideoPlayerInterface.PreviewAndDuration(image?.asImageBitmap(), durationMs, timestamp ?: 0)
+  } catch (e: Exception) {
+    Log.e(TAG, "Utils.android getBitmapFromVideo error: ${e.message}")
+    if (withAlertOnException) showVideoDecodingException()
+
+    VideoPlayerInterface.PreviewAndDuration(null, 0, 0)
   }
-  mmr.release()
-  return VideoPlayerInterface.PreviewAndDuration(image?.asImageBitmap(), durationMs, timestamp ?: 0)
-}
 
 actual fun ByteArray.toBase64StringForPassphrase(): String = Base64.encodeToString(this, Base64.DEFAULT)
 
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
index e724dfd7c..2e46a1387 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -589,18 +589,30 @@ fun ChatInfoToolbar(
   if (chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.allowsFeature(ChatFeature.Calls)) {
     if (activeCall == null) {
       barButtons.add {
-        IconButton(
-          {
+        if (appPlatform.isAndroid) {
+          IconButton({
             showMenu.value = false
             startCall(CallMediaType.Audio)
-          },
-          enabled = chat.chatInfo.contact.ready && chat.chatInfo.contact.active
-        ) {
-          Icon(
-            painterResource(MR.images.ic_call_500),
-            stringResource(MR.strings.icon_descr_more_button),
-            tint = if (chat.chatInfo.contact.ready && chat.chatInfo.contact.active) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
-          )
+          }, enabled = chat.chatInfo.contact.ready && chat.chatInfo.contact.active
+          ) {
+            Icon(
+              painterResource(MR.images.ic_call_500),
+              stringResource(MR.strings.icon_descr_audio_call).capitalize(Locale.current),
+              tint = if (chat.chatInfo.contact.ready && chat.chatInfo.contact.active) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
+            )
+          }
+        } else {
+          IconButton({
+            showMenu.value = false
+            startCall(CallMediaType.Video)
+          }, enabled = chat.chatInfo.contact.ready && chat.chatInfo.contact.active
+          ) {
+            Icon(
+              painterResource(MR.images.ic_videocam),
+              stringResource(MR.strings.icon_descr_video_call).capitalize(Locale.current),
+              tint = if (chat.chatInfo.contact.ready && chat.chatInfo.contact.active) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
+            )
+          }
         }
       }
     } else if (activeCall?.contact?.id == chat.id) {
@@ -634,10 +646,17 @@ fun ChatInfoToolbar(
     }
     if (chat.chatInfo.contact.ready && chat.chatInfo.contact.active && activeCall == null) {
       menuItems.add {
-        ItemAction(stringResource(MR.strings.icon_descr_video_call).capitalize(Locale.current), painterResource(MR.images.ic_videocam), onClick = {
-          showMenu.value = false
-          startCall(CallMediaType.Video)
-        })
+        if (appPlatform.isAndroid) {
+          ItemAction(stringResource(MR.strings.icon_descr_video_call).capitalize(Locale.current), painterResource(MR.images.ic_videocam), onClick = {
+            showMenu.value = false
+            startCall(CallMediaType.Video)
+          })
+        } else {
+          ItemAction(stringResource(MR.strings.icon_descr_audio_call).capitalize(Locale.current), painterResource(MR.images.ic_call_500), onClick = {
+            showMenu.value = false
+            startCall(CallMediaType.Audio)
+          })
+        }
       }
     }
   } else if (chat.chatInfo is ChatInfo.Group && chat.chatInfo.groupInfo.canAddMembers) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
index 84a5879b2..59e43557e 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
@@ -178,11 +178,13 @@ fun MutableState<ComposeState>.processPickedFile(uri: URI?, text: String?) {
       if (fileName != null) {
         value = value.copy(message = text ?: value.message, preview = ComposePreview.FilePreview(fileName, uri))
       }
-    } else {
+    } else if (fileSize != null) {
       AlertManager.shared.showAlertMsg(
         generalGetString(MR.strings.large_file),
         String.format(generalGetString(MR.strings.maximum_supported_file_size), formatBytes(maxFileSize))
       )
+    } else {
+      showWrongUriAlert()
     }
   }
 }
@@ -196,7 +198,8 @@ suspend fun MutableState<ComposeState>.processPickedMedia(uris: List<URI>, text:
       isImage(uri) -> {
         // Image
         val drawable = getDrawableFromUri(uri)
-        bitmap = getBitmapFromUri(uri)
+        // Do not show alert in case it's already shown from the function above
+        bitmap = getBitmapFromUri(uri, withAlertOnException = AlertManager.shared.alertViews.isEmpty())
         if (isAnimImage(uri, drawable)) {
           // It's a gif or webp
           val fileSize = getFileSize(uri)
@@ -209,13 +212,13 @@ suspend fun MutableState<ComposeState>.processPickedMedia(uris: List<URI>, text:
               String.format(generalGetString(MR.strings.maximum_supported_file_size), formatBytes(maxFileSize))
             )
           }
-        } else {
+        } else if (bitmap != null) {
           content.add(UploadContent.SimpleImage(uri))
         }
       }
       else -> {
         // Video
-        val res = getBitmapFromVideo(uri)
+        val res = getBitmapFromVideo(uri, withAlertOnException = true)
         bitmap = res.preview
         val durationMs = res.duration
         content.add(UploadContent.Video(uri, durationMs?.div(1000)?.toInt() ?: 0))
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt
index 2aad0bc3d..dae79e6fc 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt
@@ -151,7 +151,7 @@ fun saveAnimImage(uri: URI, encrypted: Boolean): CryptoFile? {
 
 expect suspend fun saveTempImageUncompressed(image: ImageBitmap, asPng: Boolean): File?
 
-fun saveFileFromUri(uri: URI, encrypted: Boolean): CryptoFile? {
+fun saveFileFromUri(uri: URI, encrypted: Boolean, withAlertOnException: Boolean = true): CryptoFile? {
   return try {
     val inputStream = uri.inputStream()
     val fileToSave = getFileName(uri)
@@ -170,10 +170,14 @@ fun saveFileFromUri(uri: URI, encrypted: Boolean): CryptoFile? {
       }
     } else {
       Log.e(TAG, "Util.kt saveFileFromUri null inputStream")
+      if (withAlertOnException) showWrongUriAlert()
+
       null
     }
   } catch (e: Exception) {
     Log.e(TAG, "Util.kt saveFileFromUri error: ${e.stackTraceToString()}")
+    if (withAlertOnException) showWrongUriAlert()
+
     null
   }
 }
@@ -267,7 +271,28 @@ fun getMaxFileSize(fileProtocol: FileProtocol): Long {
   }
 }
 
-expect suspend fun getBitmapFromVideo(uri: URI, timestamp: Long? = null, random: Boolean = true): VideoPlayerInterface.PreviewAndDuration
+expect suspend fun getBitmapFromVideo(uri: URI, timestamp: Long? = null, random: Boolean = true, withAlertOnException: Boolean = true): VideoPlayerInterface.PreviewAndDuration
+
+fun showWrongUriAlert() {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(MR.strings.non_content_uri_alert_title),
+    text = generalGetString(MR.strings.non_content_uri_alert_text)
+  )
+}
+
+fun showImageDecodingException() {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(MR.strings.image_decoding_exception_title),
+    text = generalGetString(MR.strings.image_decoding_exception_desc)
+  )
+}
+
+fun showVideoDecodingException() {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(MR.strings.image_decoding_exception_title),
+    text = generalGetString(MR.strings.video_decoding_exception_desc)
+  )
+}
 
 fun Color.darker(factor: Float = 0.1f): Color =
   Color(max(red * (1 - factor), 0f), max(green * (1 - factor), 0f), max(blue * (1 - factor), 0f), alpha)
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
index 9df3f9d62..ff34934e4 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@@ -309,6 +309,7 @@
   <string name="videos_limit_desc">Only 10 videos can be sent at the same time</string>
   <string name="image_decoding_exception_title">Decoding error</string>
   <string name="image_decoding_exception_desc">The image cannot be decoded. Please, try a different image or contact developers.</string>
+  <string name="video_decoding_exception_desc">The video cannot be decoded. Please, try a different video or contact developers.</string>
   <string name="you_are_observer">you are observer</string>
   <string name="observer_cant_send_message_title">You can\'t send messages!</string>
   <string name="observer_cant_send_message_desc">Please contact group admin.</string>
diff --git a/apps/multiplatform/common/src/commonMain/resources/assets/www/android/call.html b/apps/multiplatform/common/src/commonMain/resources/assets/www/android/call.html
index 46910bfaf..7b51a0515 100644
--- a/apps/multiplatform/common/src/commonMain/resources/assets/www/android/call.html
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/android/call.html
@@ -11,6 +11,7 @@
       autoplay
       playsinline
       poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
+      onclick="javascript:toggleRemoteVideoFitFill()"
     ></video>
     <video
       id="local-video-stream"
diff --git a/apps/multiplatform/common/src/commonMain/resources/assets/www/call.js b/apps/multiplatform/common/src/commonMain/resources/assets/www/call.js
index 62c9ca7fb..6092eb39e 100644
--- a/apps/multiplatform/common/src/commonMain/resources/assets/www/call.js
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/call.js
@@ -14,6 +14,7 @@ var VideoCamera;
 // for debugging
 // var sendMessageToNative = ({resp}: WVApiMessage) => console.log(JSON.stringify({command: resp}))
 var sendMessageToNative = (msg) => console.log(JSON.stringify(msg));
+var toggleScreenShare = async () => { };
 // Global object with cryptrographic/encoding functions
 const callCrypto = callCryptoFunction();
 var TransformOperation;
@@ -24,6 +25,7 @@ var TransformOperation;
 let activeCall;
 let answerTimeout = 30000;
 var useWorker = false;
+var isDesktop = false;
 var localizedState = "";
 var localizedDescription = "";
 const processCommand = (function () {
@@ -106,8 +108,24 @@ const processCommand = (function () {
         const remoteStream = new MediaStream();
         const localCamera = VideoCamera.User;
         const localStream = await getLocalMediaStream(mediaType, localCamera);
+        if (isDesktop) {
+            localStream
+                .getTracks()
+                .filter((elem) => elem.kind == "video")
+                .forEach((elem) => (elem.enabled = false));
+        }
         const iceCandidates = getIceCandidates(pc, config);
-        const call = { connection: pc, iceCandidates, localMedia: mediaType, localCamera, localStream, remoteStream, aesKey };
+        const call = {
+            connection: pc,
+            iceCandidates,
+            localMedia: mediaType,
+            localCamera,
+            localStream,
+            remoteStream,
+            aesKey,
+            screenShareEnabled: false,
+            cameraEnabled: true,
+        };
         await setupMediaStreams(call);
         let connectionTimeout = setTimeout(connectionHandler, answerTimeout);
         pc.addEventListener("connectionstatechange", connectionStateChange);
@@ -430,12 +448,31 @@ const processCommand = (function () {
         if (!videos)
             throw Error("no video elements");
         const pc = call.connection;
+        const oldAudioTracks = call.localStream.getAudioTracks();
+        const audioWasEnabled = oldAudioTracks.some((elem) => elem.enabled);
+        let localStream;
+        try {
+            localStream = call.screenShareEnabled ? await getLocalScreenCaptureStream() : await getLocalMediaStream(call.localMedia, camera);
+        }
+        catch (e) {
+            if (call.screenShareEnabled) {
+                call.screenShareEnabled = false;
+            }
+            return;
+        }
         for (const t of call.localStream.getTracks())
             t.stop();
         call.localCamera = camera;
-        const localStream = await getLocalMediaStream(call.localMedia, camera);
-        replaceTracks(pc, localStream.getVideoTracks());
-        replaceTracks(pc, localStream.getAudioTracks());
+        const audioTracks = localStream.getAudioTracks();
+        const videoTracks = localStream.getVideoTracks();
+        if (!audioWasEnabled && oldAudioTracks.length > 0) {
+            audioTracks.forEach((elem) => (elem.enabled = false));
+        }
+        if (!call.cameraEnabled && !call.screenShareEnabled) {
+            videoTracks.forEach((elem) => (elem.enabled = false));
+        }
+        replaceTracks(pc, audioTracks);
+        replaceTracks(pc, videoTracks);
         call.localStream = localStream;
         videos.local.srcObject = localStream;
     }
@@ -472,6 +509,21 @@ const processCommand = (function () {
         const constraints = callMediaConstraints(mediaType, facingMode);
         return navigator.mediaDevices.getUserMedia(constraints);
     }
+    function getLocalScreenCaptureStream() {
+        const constraints /* DisplayMediaStreamConstraints */ = {
+            video: {
+                frameRate: 24,
+                //width: {
+                //min: 480,
+                //ideal: 720,
+                //max: 1280,
+                //},
+                //aspectRatio: 1.33,
+            },
+            audio: true,
+        };
+        return navigator.mediaDevices.getDisplayMedia(constraints);
+    }
     function callMediaConstraints(mediaType, facingMode) {
         switch (mediaType) {
             case CallMediaType.Audio:
@@ -526,9 +578,23 @@ const processCommand = (function () {
         const tracks = media == CallMediaType.Video ? s.getVideoTracks() : s.getAudioTracks();
         for (const t of tracks)
             t.enabled = enable;
+        if (media == CallMediaType.Video && activeCall) {
+            activeCall.cameraEnabled = enable;
+        }
     }
+    toggleScreenShare = async function () {
+        const call = activeCall;
+        if (!call)
+            return;
+        call.screenShareEnabled = !call.screenShareEnabled;
+        await replaceMedia(call, call.localCamera);
+    };
     return processCommand;
 })();
+function toggleRemoteVideoFitFill() {
+    const remote = document.getElementById("remote-video-stream");
+    remote.style.objectFit = remote.style.objectFit != "contain" ? "contain" : "cover";
+}
 function toggleMedia(s, media) {
     let res = false;
     const tracks = media == CallMediaType.Video ? s.getVideoTracks() : s.getAudioTracks();
@@ -536,6 +602,9 @@ function toggleMedia(s, media) {
         t.enabled = !t.enabled;
         res = t.enabled;
     }
+    if (media == CallMediaType.Video && activeCall) {
+        activeCall.cameraEnabled = res;
+    }
     return res;
 }
 // Cryptography function - it is loaded both in the main window and in worker context (if the worker is used)
diff --git a/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/call.html b/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/call.html
index 5e945ffe6..dd1193bab 100644
--- a/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/call.html
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/call.html
@@ -12,6 +12,7 @@
       autoplay
       playsinline
       poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
+      onclick="javascript:toggleRemoteVideoFitFill()"
     ></video>
     <video
       id="local-video-stream"
@@ -29,6 +30,9 @@
       <img src="/desktop/images/ic_phone_in_talk.svg" />
     </div>
     <p id="manage-call">
+      <button id="toggle-screen" style="display: none" onclick="javascript:toggleScreenManually()">
+        <img src="/desktop/images/ic_screen_share.svg" />
+      </button>
       <button id="toggle-audio" style="display: none" onclick="javascript:toggleAudioManually()">
         <img src="/desktop/images/ic_mic.svg" />
       </button>
@@ -39,7 +43,7 @@
         <img src="/desktop/images/ic_volume_up.svg" />
       </button>
       <button id="toggle-video" style="display: none" onclick="javascript:toggleVideoManually()">
-        <img src="/desktop/images/ic_videocam_filled.svg" />
+        <img src="/desktop/images/ic_videocam_off.svg" />
       </button>
     </p>
   </body>
diff --git a/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/images/ic_screen_share.svg b/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/images/ic_screen_share.svg
new file mode 100644
index 000000000..979af2b07
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/images/ic_screen_share.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="44" viewBox="0 -960 960 960" width="44"><path fill="white" d="M335.5-388H393v-89q0-23.875 16.35-40.438Q425.7-534 450.175-534H530v68l97-96.5-97-97v68h-80.077q-47.756 0-81.09 33.396Q335.5-524.708 335.5-477v89ZM74-126q-12.25 0-20.625-8.425Q45-142.851 45-154.925 45-167 53.375-175.25T74-183.5h812.5q11.675 0 20.088 8.463Q915-166.574 915-154.825q0 12.325-8.412 20.575Q898.175-126 886.5-126H74Zm68.5-117q-22.969 0-40.234-17.266Q85-277.531 85-300.5V-777q0-22.969 17.266-40.234Q119.531-834.5 142.5-834.5h675q22.969 0 40.234 17.266Q875-799.969 875-777v476.5q0 22.969-17.266 40.234Q840.469-243 817.5-243h-675Zm0-57.5h675V-777h-675v476.5Zm0 0V-777v476.5Z"/></svg>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/images/ic_stop_screen_share.svg b/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/images/ic_stop_screen_share.svg
new file mode 100644
index 000000000..92e1ff338
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/images/ic_stop_screen_share.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="44" viewBox="0 -960 960 960" width="44"><path fill="white" d="m549-484.5-107-107h88v-68l97 97-78 78ZM799.5-233 741-291.5h70.5V-771h-550L204-828.5h607.5q22.969 0 40.234 17.266Q869-793.969 869-771v479.53q0 26.088-20.25 43.779Q828.5-230 799.5-233Zm36 200.5L737-131H45v-57.5h635L634.5-234h-485q-22.969 0-40.234-17.266Q92-268.531 92-291.5v-481.25q0-2.75.5-3.75l-56-55L78-873 877-74l-41.5 41.5ZM393-475.5v88h-57.5V-477q0-10 2.25-22.5t7.25-23.534L149.5-719v427.5H577l-184-184ZM502-532Zm-138 26.5Z"/></svg>
\ No newline at end of file
diff --git a/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/ui.js b/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/ui.js
index 2514a2411..6cf711b79 100644
--- a/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/ui.js
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/ui.js
@@ -1,6 +1,7 @@
 "use strict";
 // Override defaults to enable worker on Chrome and Safari
 useWorker = typeof window.Worker !== "undefined";
+isDesktop = true;
 // Create WebSocket connection.
 const socket = new WebSocket(`ws://${location.host}`);
 socket.addEventListener("open", (_event) => {
@@ -42,11 +43,28 @@ function toggleSpeakerManually() {
 }
 function toggleVideoManually() {
     if (activeCall === null || activeCall === void 0 ? void 0 : activeCall.localMedia) {
-        document.getElementById("toggle-video").innerHTML = toggleMedia(activeCall.localStream, CallMediaType.Video)
+        let res;
+        if (activeCall === null || activeCall === void 0 ? void 0 : activeCall.screenShareEnabled) {
+            activeCall.cameraEnabled = !activeCall.cameraEnabled;
+            res = activeCall.cameraEnabled;
+        }
+        else {
+            res = toggleMedia(activeCall.localStream, CallMediaType.Video);
+        }
+        document.getElementById("toggle-video").innerHTML = res
             ? '<img src="/desktop/images/ic_videocam_filled.svg" />'
             : '<img src="/desktop/images/ic_videocam_off.svg" />';
     }
 }
+async function toggleScreenManually() {
+    const was = activeCall === null || activeCall === void 0 ? void 0 : activeCall.screenShareEnabled;
+    await toggleScreenShare();
+    if (was != (activeCall === null || activeCall === void 0 ? void 0 : activeCall.screenShareEnabled)) {
+        document.getElementById("toggle-screen").innerHTML = (activeCall === null || activeCall === void 0 ? void 0 : activeCall.screenShareEnabled)
+            ? '<img src="/desktop/images/ic_stop_screen_share.svg" />'
+            : '<img src="/desktop/images/ic_screen_share.svg" />';
+    }
+}
 function reactOnMessageFromServer(msg) {
     var _a;
     switch ((_a = msg.command) === null || _a === void 0 ? void 0 : _a.type) {
@@ -57,8 +75,9 @@ function reactOnMessageFromServer(msg) {
         case "start":
             document.getElementById("toggle-audio").style.display = "inline-block";
             document.getElementById("toggle-speaker").style.display = "inline-block";
-            if (msg.command.media == "video") {
+            if (msg.command.media == CallMediaType.Video) {
                 document.getElementById("toggle-video").style.display = "inline-block";
+                document.getElementById("toggle-screen").style.display = "inline-block";
             }
             document.getElementById("info-block").className = msg.command.media;
             break;
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/VideoPlayer.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/VideoPlayer.desktop.kt
index 9f8c1884e..fa0a8247a 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/VideoPlayer.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/VideoPlayer.desktop.kt
@@ -189,7 +189,7 @@ actual class VideoPlayer actual constructor(
   private fun setPreviewAndDuration() {
     // It freezes main thread, doing it in IO thread
     CoroutineScope(Dispatchers.IO).launch {
-      val previewAndDuration = VideoPlayerHolder.previewsAndDurations.getOrPut(uri) { getBitmapFromVideo(defaultPreview, uri) }
+      val previewAndDuration = VideoPlayerHolder.previewsAndDurations.getOrPut(uri) { getBitmapFromVideo(defaultPreview, uri, withAlertOnException = false) }
       withContext(Dispatchers.Main) {
         preview.value = previewAndDuration.preview ?: defaultPreview
         duration.value = (previewAndDuration.duration ?: 0)
@@ -214,10 +214,12 @@ actual class VideoPlayer actual constructor(
       }
     }
 
-    suspend fun getBitmapFromVideo(defaultPreview: ImageBitmap?, uri: URI?): VideoPlayerInterface.PreviewAndDuration = withContext(playerThread.asCoroutineDispatcher()) {
+    suspend fun getBitmapFromVideo(defaultPreview: ImageBitmap?, uri: URI?, withAlertOnException: Boolean = true): VideoPlayerInterface.PreviewAndDuration = withContext(playerThread.asCoroutineDispatcher()) {
       val mediaComponent = getOrCreateHelperPlayer()
       val player = mediaComponent.mediaPlayer()
       if (uri == null || !File(uri.rawPath).exists()) {
+        if (withAlertOnException) showVideoDecodingException()
+
         return@withContext VideoPlayerInterface.PreviewAndDuration(preview = defaultPreview, timestamp = 0L, duration = 0L)
       }
       player.media().startPaused(uri.toString().replaceFirst("file:", "file://"))
@@ -227,7 +229,14 @@ actual class VideoPlayer actual constructor(
         snap = player.snapshots()?.get()
         delay(10)
       }
-      val orientation = player.media().info().videoTracks().first().orientation()
+      val orientation = player.media().info().videoTracks().firstOrNull()?.orientation()
+      if (orientation == null) {
+        player.stop()
+        putHelperPlayer(mediaComponent)
+        if (withAlertOnException) showVideoDecodingException()
+
+        return@withContext VideoPlayerInterface.PreviewAndDuration(preview = defaultPreview, timestamp = 0L, duration = 0L)
+      }
       val preview: ImageBitmap? = when (orientation) {
         VideoOrientation.TOP_LEFT -> snap
         VideoOrientation.TOP_RIGHT -> snap?.flip(false, true)
diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/helpers/Utils.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/helpers/Utils.desktop.kt
index 2a9042c43..e867dd1b3 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/helpers/Utils.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/helpers/Utils.desktop.kt
@@ -9,6 +9,7 @@ import chat.simplex.common.model.CIFile
 import chat.simplex.common.model.readCryptoFile
 import chat.simplex.common.platform.*
 import chat.simplex.common.simplexWindowState
+import chat.simplex.res.MR
 import java.io.ByteArrayInputStream
 import java.io.File
 import java.net.URI
@@ -108,10 +109,24 @@ actual fun getAppFilePath(uri: URI): String? = uri.path
 actual fun getFileSize(uri: URI): Long? = uri.toPath().toFile().length()
 
 actual fun getBitmapFromUri(uri: URI, withAlertOnException: Boolean): ImageBitmap? =
-  ImageIO.read(uri.inputStream()).toComposeImageBitmap()
+  try {
+    ImageIO.read(uri.inputStream()).toComposeImageBitmap()
+  } catch (e: Exception) {
+    Log.e(TAG, "Error while decoding drawable: ${e.stackTraceToString()}")
+    if (withAlertOnException) showImageDecodingException()
+
+    null
+  }
 
 actual fun getBitmapFromByteArray(data: ByteArray, withAlertOnException: Boolean): ImageBitmap? =
-  ImageIO.read(ByteArrayInputStream(data)).toComposeImageBitmap()
+  try {
+    ImageIO.read(ByteArrayInputStream(data)).toComposeImageBitmap()
+  } catch (e: Exception) {
+    Log.e(TAG, "Error while encoding bitmap from byte array: ${e.stackTraceToString()}")
+    if (withAlertOnException) showImageDecodingException()
+
+    null
+  }
 
 // LALAL implement to support animated drawable
 actual fun getDrawableFromUri(uri: URI, withAlertOnException: Boolean): Any? = null
@@ -132,8 +147,8 @@ actual suspend fun saveTempImageUncompressed(image: ImageBitmap, asPng: Boolean)
   } else null
 }
 
-actual suspend fun getBitmapFromVideo(uri: URI, timestamp: Long?, random: Boolean): VideoPlayerInterface.PreviewAndDuration {
-  return VideoPlayer.getBitmapFromVideo(null, uri)
+actual suspend fun getBitmapFromVideo(uri: URI, timestamp: Long?, random: Boolean, withAlertOnException: Boolean): VideoPlayerInterface.PreviewAndDuration {
+  return VideoPlayer.getBitmapFromVideo(null, uri, withAlertOnException)
 }
 
 @OptIn(ExperimentalEncodingApi::class)
diff --git a/apps/simplex-broadcast-bot/src/Broadcast/Bot.hs b/apps/simplex-broadcast-bot/src/Broadcast/Bot.hs
index afeb116f7..5fa3fff0a 100644
--- a/apps/simplex-broadcast-bot/src/Broadcast/Bot.hs
+++ b/apps/simplex-broadcast-bot/src/Broadcast/Bot.hs
@@ -62,7 +62,8 @@ broadcastBot BroadcastBotOpts {publishers, welcomeMessage, prohibitedMessage} _u
             MCLink {} -> True
             MCImage {} -> True
             _ -> False
-          broadcastTo ct'@Contact {activeConn = conn@Connection {connStatus}} =
+          broadcastTo Contact {activeConn = Nothing} = False
+          broadcastTo ct'@Contact {activeConn = Just conn@Connection {connStatus}} =
             (connStatus == ConnSndReady || connStatus == ConnReady)
               && not (connDisabled conn)
               && contactId' ct' /= contactId' ct
diff --git a/packages/simplex-chat-webrtc/src/android/call.html b/packages/simplex-chat-webrtc/src/android/call.html
index 46910bfaf..7b51a0515 100644
--- a/packages/simplex-chat-webrtc/src/android/call.html
+++ b/packages/simplex-chat-webrtc/src/android/call.html
@@ -11,6 +11,7 @@
       autoplay
       playsinline
       poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
+      onclick="javascript:toggleRemoteVideoFitFill()"
     ></video>
     <video
       id="local-video-stream"
diff --git a/packages/simplex-chat-webrtc/src/call.ts b/packages/simplex-chat-webrtc/src/call.ts
index 2a55b2671..7afdbe100 100644
--- a/packages/simplex-chat-webrtc/src/call.ts
+++ b/packages/simplex-chat-webrtc/src/call.ts
@@ -165,6 +165,7 @@ interface ConnectionInfo {
 // for debugging
 // var sendMessageToNative = ({resp}: WVApiMessage) => console.log(JSON.stringify({command: resp}))
 var sendMessageToNative = (msg: WVApiMessage) => console.log(JSON.stringify(msg))
+var toggleScreenShare = async () => {}
 
 // Global object with cryptrographic/encoding functions
 const callCrypto = callCryptoFunction()
@@ -193,6 +194,8 @@ interface Call {
   localCamera: VideoCamera
   localStream: MediaStream
   remoteStream: MediaStream
+  screenShareEnabled: boolean
+  cameraEnabled: boolean
   aesKey?: string
   worker?: Worker
   key?: CryptoKey
@@ -201,6 +204,7 @@ interface Call {
 let activeCall: Call | undefined
 let answerTimeout = 30_000
 var useWorker = false
+var isDesktop = false
 var localizedState = ""
 var localizedDescription = ""
 
@@ -308,8 +312,24 @@ const processCommand = (function () {
     const remoteStream = new MediaStream()
     const localCamera = VideoCamera.User
     const localStream = await getLocalMediaStream(mediaType, localCamera)
+    if (isDesktop) {
+      localStream
+        .getTracks()
+        .filter((elem) => elem.kind == "video")
+        .forEach((elem) => (elem.enabled = false))
+    }
     const iceCandidates = getIceCandidates(pc, config)
-    const call = {connection: pc, iceCandidates, localMedia: mediaType, localCamera, localStream, remoteStream, aesKey}
+    const call = {
+      connection: pc,
+      iceCandidates,
+      localMedia: mediaType,
+      localCamera,
+      localStream,
+      remoteStream,
+      aesKey,
+      screenShareEnabled: false,
+      cameraEnabled: true,
+    }
     await setupMediaStreams(call)
     let connectionTimeout: number | undefined = setTimeout(connectionHandler, answerTimeout)
     pc.addEventListener("connectionstatechange", connectionStateChange)
@@ -626,11 +646,31 @@ const processCommand = (function () {
     const videos = getVideoElements()
     if (!videos) throw Error("no video elements")
     const pc = call.connection
+    const oldAudioTracks = call.localStream.getAudioTracks()
+    const audioWasEnabled = oldAudioTracks.some((elem) => elem.enabled)
+    let localStream: MediaStream
+    try {
+      localStream = call.screenShareEnabled ? await getLocalScreenCaptureStream() : await getLocalMediaStream(call.localMedia, camera)
+    } catch (e: any) {
+      if (call.screenShareEnabled) {
+        call.screenShareEnabled = false
+      }
+      return
+    }
     for (const t of call.localStream.getTracks()) t.stop()
     call.localCamera = camera
-    const localStream = await getLocalMediaStream(call.localMedia, camera)
-    replaceTracks(pc, localStream.getVideoTracks())
-    replaceTracks(pc, localStream.getAudioTracks())
+
+    const audioTracks = localStream.getAudioTracks()
+    const videoTracks = localStream.getVideoTracks()
+    if (!audioWasEnabled && oldAudioTracks.length > 0) {
+      audioTracks.forEach((elem) => (elem.enabled = false))
+    }
+    if (!call.cameraEnabled && !call.screenShareEnabled) {
+      videoTracks.forEach((elem) => (elem.enabled = false))
+    }
+
+    replaceTracks(pc, audioTracks)
+    replaceTracks(pc, videoTracks)
     call.localStream = localStream
     videos.local.srcObject = localStream
   }
@@ -671,6 +711,22 @@ const processCommand = (function () {
     return navigator.mediaDevices.getUserMedia(constraints)
   }
 
+  function getLocalScreenCaptureStream(): Promise<MediaStream> {
+    const constraints: any /* DisplayMediaStreamConstraints */ = {
+      video: {
+        frameRate: 24,
+        //width: {
+        //min: 480,
+        //ideal: 720,
+        //max: 1280,
+        //},
+        //aspectRatio: 1.33,
+      },
+      audio: true,
+    }
+    return navigator.mediaDevices.getDisplayMedia(constraints)
+  }
+
   function callMediaConstraints(mediaType: CallMediaType, facingMode: VideoCamera): MediaStreamConstraints {
     switch (mediaType) {
       case CallMediaType.Audio:
@@ -735,10 +791,26 @@ const processCommand = (function () {
   function enableMedia(s: MediaStream, media: CallMediaType, enable: boolean) {
     const tracks = media == CallMediaType.Video ? s.getVideoTracks() : s.getAudioTracks()
     for (const t of tracks) t.enabled = enable
+    if (media == CallMediaType.Video && activeCall) {
+      activeCall.cameraEnabled = enable
+    }
   }
+
+  toggleScreenShare = async function () {
+    const call = activeCall
+    if (!call) return
+    call.screenShareEnabled = !call.screenShareEnabled
+    await replaceMedia(call, call.localCamera)
+  }
+
   return processCommand
 })()
 
+function toggleRemoteVideoFitFill() {
+  const remote = document.getElementById("remote-video-stream")!
+  remote.style.objectFit = remote.style.objectFit != "contain" ? "contain" : "cover"
+}
+
 function toggleMedia(s: MediaStream, media: CallMediaType): boolean {
   let res = false
   const tracks = media == CallMediaType.Video ? s.getVideoTracks() : s.getAudioTracks()
@@ -746,6 +818,9 @@ function toggleMedia(s: MediaStream, media: CallMediaType): boolean {
     t.enabled = !t.enabled
     res = t.enabled
   }
+  if (media == CallMediaType.Video && activeCall) {
+    activeCall.cameraEnabled = res
+  }
   return res
 }
 
diff --git a/packages/simplex-chat-webrtc/src/desktop/call.html b/packages/simplex-chat-webrtc/src/desktop/call.html
index 5e945ffe6..dd1193bab 100644
--- a/packages/simplex-chat-webrtc/src/desktop/call.html
+++ b/packages/simplex-chat-webrtc/src/desktop/call.html
@@ -12,6 +12,7 @@
       autoplay
       playsinline
       poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
+      onclick="javascript:toggleRemoteVideoFitFill()"
     ></video>
     <video
       id="local-video-stream"
@@ -29,6 +30,9 @@
       <img src="/desktop/images/ic_phone_in_talk.svg" />
     </div>
     <p id="manage-call">
+      <button id="toggle-screen" style="display: none" onclick="javascript:toggleScreenManually()">
+        <img src="/desktop/images/ic_screen_share.svg" />
+      </button>
       <button id="toggle-audio" style="display: none" onclick="javascript:toggleAudioManually()">
         <img src="/desktop/images/ic_mic.svg" />
       </button>
@@ -39,7 +43,7 @@
         <img src="/desktop/images/ic_volume_up.svg" />
       </button>
       <button id="toggle-video" style="display: none" onclick="javascript:toggleVideoManually()">
-        <img src="/desktop/images/ic_videocam_filled.svg" />
+        <img src="/desktop/images/ic_videocam_off.svg" />
       </button>
     </p>
   </body>
diff --git a/packages/simplex-chat-webrtc/src/desktop/images/ic_screen_share.svg b/packages/simplex-chat-webrtc/src/desktop/images/ic_screen_share.svg
new file mode 100644
index 000000000..979af2b07
--- /dev/null
+++ b/packages/simplex-chat-webrtc/src/desktop/images/ic_screen_share.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="44" viewBox="0 -960 960 960" width="44"><path fill="white" d="M335.5-388H393v-89q0-23.875 16.35-40.438Q425.7-534 450.175-534H530v68l97-96.5-97-97v68h-80.077q-47.756 0-81.09 33.396Q335.5-524.708 335.5-477v89ZM74-126q-12.25 0-20.625-8.425Q45-142.851 45-154.925 45-167 53.375-175.25T74-183.5h812.5q11.675 0 20.088 8.463Q915-166.574 915-154.825q0 12.325-8.412 20.575Q898.175-126 886.5-126H74Zm68.5-117q-22.969 0-40.234-17.266Q85-277.531 85-300.5V-777q0-22.969 17.266-40.234Q119.531-834.5 142.5-834.5h675q22.969 0 40.234 17.266Q875-799.969 875-777v476.5q0 22.969-17.266 40.234Q840.469-243 817.5-243h-675Zm0-57.5h675V-777h-675v476.5Zm0 0V-777v476.5Z"/></svg>
\ No newline at end of file
diff --git a/packages/simplex-chat-webrtc/src/desktop/images/ic_stop_screen_share.svg b/packages/simplex-chat-webrtc/src/desktop/images/ic_stop_screen_share.svg
new file mode 100644
index 000000000..92e1ff338
--- /dev/null
+++ b/packages/simplex-chat-webrtc/src/desktop/images/ic_stop_screen_share.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="44" viewBox="0 -960 960 960" width="44"><path fill="white" d="m549-484.5-107-107h88v-68l97 97-78 78ZM799.5-233 741-291.5h70.5V-771h-550L204-828.5h607.5q22.969 0 40.234 17.266Q869-793.969 869-771v479.53q0 26.088-20.25 43.779Q828.5-230 799.5-233Zm36 200.5L737-131H45v-57.5h635L634.5-234h-485q-22.969 0-40.234-17.266Q92-268.531 92-291.5v-481.25q0-2.75.5-3.75l-56-55L78-873 877-74l-41.5 41.5ZM393-475.5v88h-57.5V-477q0-10 2.25-22.5t7.25-23.534L149.5-719v427.5H577l-184-184ZM502-532Zm-138 26.5Z"/></svg>
\ No newline at end of file
diff --git a/packages/simplex-chat-webrtc/src/desktop/ui.ts b/packages/simplex-chat-webrtc/src/desktop/ui.ts
index f72adffd9..4f336a17b 100644
--- a/packages/simplex-chat-webrtc/src/desktop/ui.ts
+++ b/packages/simplex-chat-webrtc/src/desktop/ui.ts
@@ -1,5 +1,6 @@
 // Override defaults to enable worker on Chrome and Safari
 useWorker = typeof window.Worker !== "undefined"
+isDesktop = true
 
 // Create WebSocket connection.
 const socket = new WebSocket(`ws://${location.host}`)
@@ -49,12 +50,29 @@ function toggleSpeakerManually() {
 
 function toggleVideoManually() {
   if (activeCall?.localMedia) {
-    document.getElementById("toggle-video")!!.innerHTML = toggleMedia(activeCall.localStream, CallMediaType.Video)
+    let res: boolean
+    if (activeCall?.screenShareEnabled) {
+      activeCall.cameraEnabled = !activeCall.cameraEnabled
+      res = activeCall.cameraEnabled
+    } else {
+      res = toggleMedia(activeCall.localStream, CallMediaType.Video)
+    }
+    document.getElementById("toggle-video")!!.innerHTML = res
       ? '<img src="/desktop/images/ic_videocam_filled.svg" />'
       : '<img src="/desktop/images/ic_videocam_off.svg" />'
   }
 }
 
+async function toggleScreenManually() {
+  const was = activeCall?.screenShareEnabled
+  await toggleScreenShare()
+  if (was != activeCall?.screenShareEnabled) {
+    document.getElementById("toggle-screen")!!.innerHTML = activeCall?.screenShareEnabled
+      ? '<img src="/desktop/images/ic_stop_screen_share.svg" />'
+      : '<img src="/desktop/images/ic_screen_share.svg" />'
+  }
+}
+
 function reactOnMessageFromServer(msg: WVApiMessage) {
   switch (msg.command?.type) {
     case "capabilities":
@@ -64,8 +82,9 @@ function reactOnMessageFromServer(msg: WVApiMessage) {
     case "start":
       document.getElementById("toggle-audio")!!.style.display = "inline-block"
       document.getElementById("toggle-speaker")!!.style.display = "inline-block"
-      if (msg.command.media == "video") {
+      if (msg.command.media == CallMediaType.Video) {
         document.getElementById("toggle-video")!!.style.display = "inline-block"
+        document.getElementById("toggle-screen")!!.style.display = "inline-block"
       }
       document.getElementById("info-block")!!.className = msg.command.media
       break
diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index 28b4c5112..a0e8cf71a 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -648,8 +648,8 @@ processChatCommand = \case
               let fileName = takeFileName file
                   fileInvitation = FileInvitation {fileName, fileSize, fileDigest = Nothing, fileConnReq, fileInline, fileDescr = Nothing}
               chSize <- asks $ fileChunkSize . config
-              withStore' $ \db -> do
-                ft@FileTransferMeta {fileId} <- createSndDirectFileTransfer db userId ct file fileInvitation agentConnId_ chSize subMode
+              withStore $ \db -> do
+                ft@FileTransferMeta {fileId} <- liftIO $ createSndDirectFileTransfer db userId ct file fileInvitation agentConnId_ chSize subMode
                 fileStatus <- case fileInline of
                   Just IFMSent -> createSndDirectInlineFT db ct ft $> CIFSSndTransfer 0 1
                   _ -> pure CIFSSndStored
@@ -783,7 +783,8 @@ processChatCommand = \case
         let fileSource = Just $ CryptoFile filePath cfArgs
             ciFile = CIFile {fileId, fileName, fileSize, fileSource, fileStatus = CIFSSndStored, fileProtocol = FPXFTP}
         case contactOrGroup of
-          CGContact Contact {activeConn} -> withStore' $ \db -> createSndFTDescrXFTP db user Nothing activeConn ft fileDescr
+          CGContact Contact {activeConn} -> forM_ activeConn $ \conn ->
+            withStore' $ \db -> createSndFTDescrXFTP db user Nothing conn ft fileDescr
           CGGroup (Group _ ms) -> forM_ ms $ \m -> saveMemberFD m `catchChatError` (toView . CRChatError (Just user))
             where
               -- we are not sending files to pending members, same as with inline files
@@ -1224,7 +1225,8 @@ processChatCommand = \case
         ct <- getContact db user chatId
         liftIO $ updateContactSettings db user chatId chatSettings
         pure ct
-      withAgent $ \a -> toggleConnectionNtfs a (contactConnId ct) (chatHasNtfs chatSettings)
+      forM_ (contactConnId ct) $ \connId ->
+        withAgent $ \a -> toggleConnectionNtfs a connId (chatHasNtfs chatSettings)
       ok user
     CTGroup -> do
       ms <- withStore $ \db -> do
@@ -1245,9 +1247,12 @@ processChatCommand = \case
     ok user
   APIContactInfo contactId -> withUser $ \user@User {userId} -> do
     -- [incognito] print user's incognito profile for this contact
-    ct@Contact {activeConn = Connection {customUserProfileId}} <- withStore $ \db -> getContact db user contactId
-    incognitoProfile <- forM customUserProfileId $ \profileId -> withStore (\db -> getProfileById db userId profileId)
-    connectionStats <- withAgent (`getConnectionServers` contactConnId ct)
+    ct@Contact {activeConn} <- withStore $ \db -> getContact db user contactId
+    incognitoProfile <- case activeConn of
+      Nothing -> pure Nothing
+      Just Connection {customUserProfileId} ->
+        forM customUserProfileId $ \profileId -> withStore (\db -> getProfileById db userId profileId)
+    connectionStats <- mapM (withAgent . flip getConnectionServers) (contactConnId ct)
     pure $ CRContactInfo user ct connectionStats (fmap fromLocalProfile incognitoProfile)
   APIGroupInfo gId -> withUser $ \user -> do
     (g, s) <- withStore $ \db -> (,) <$> getGroupInfo db user gId <*> liftIO (getGroupSummary db user gId)
@@ -1258,8 +1263,11 @@ processChatCommand = \case
     pure $ CRGroupMemberInfo user g m connectionStats
   APISwitchContact contactId -> withUser $ \user -> do
     ct <- withStore $ \db -> getContact db user contactId
-    connectionStats <- withAgent $ \a -> switchConnectionAsync a "" $ contactConnId ct
-    pure $ CRContactSwitchStarted user ct connectionStats
+    case contactConnId ct of
+      Just connId -> do
+        connectionStats <- withAgent $ \a -> switchConnectionAsync a "" connId
+        pure $ CRContactSwitchStarted user ct connectionStats
+      Nothing -> throwChatError $ CEContactNotActive ct
   APISwitchGroupMember gId gMemberId -> withUser $ \user -> do
     (g, m) <- withStore $ \db -> (,) <$> getGroupInfo db user gId <*> getGroupMember db user gId gMemberId
     case memberConnId m of
@@ -1269,8 +1277,11 @@ processChatCommand = \case
       _ -> throwChatError CEGroupMemberNotActive
   APIAbortSwitchContact contactId -> withUser $ \user -> do
     ct <- withStore $ \db -> getContact db user contactId
-    connectionStats <- withAgent $ \a -> abortConnectionSwitch a $ contactConnId ct
-    pure $ CRContactSwitchAborted user ct connectionStats
+    case contactConnId ct of
+      Just connId -> do
+        connectionStats <- withAgent $ \a -> abortConnectionSwitch a connId
+        pure $ CRContactSwitchAborted user ct connectionStats
+      Nothing -> throwChatError $ CEContactNotActive ct
   APIAbortSwitchGroupMember gId gMemberId -> withUser $ \user -> do
     (g, m) <- withStore $ \db -> (,) <$> getGroupInfo db user gId <*> getGroupMember db user gId gMemberId
     case memberConnId m of
@@ -1280,9 +1291,12 @@ processChatCommand = \case
       _ -> throwChatError CEGroupMemberNotActive
   APISyncContactRatchet contactId force -> withUser $ \user -> do
     ct <- withStore $ \db -> getContact db user contactId
-    cStats@ConnectionStats {ratchetSyncState = rss} <- withAgent $ \a -> synchronizeRatchet a (contactConnId ct) force
-    createInternalChatItem user (CDDirectSnd ct) (CISndConnEvent $ SCERatchetSync rss Nothing) Nothing
-    pure $ CRContactRatchetSyncStarted user ct cStats
+    case contactConnId ct of
+      Just connId -> do
+        cStats@ConnectionStats {ratchetSyncState = rss} <- withAgent $ \a -> synchronizeRatchet a connId force
+        createInternalChatItem user (CDDirectSnd ct) (CISndConnEvent $ SCERatchetSync rss Nothing) Nothing
+        pure $ CRContactRatchetSyncStarted user ct cStats
+      Nothing -> throwChatError $ CEContactNotActive ct
   APISyncGroupMemberRatchet gId gMemberId force -> withUser $ \user -> do
     (g, m) <- withStore $ \db -> (,) <$> getGroupInfo db user gId <*> getGroupMember db user gId gMemberId
     case memberConnId m of
@@ -1292,16 +1306,19 @@ processChatCommand = \case
         pure $ CRGroupMemberRatchetSyncStarted user g m cStats
       _ -> throwChatError CEGroupMemberNotActive
   APIGetContactCode contactId -> withUser $ \user -> do
-    ct@Contact {activeConn = conn@Connection {connId}} <- withStore $ \db -> getContact db user contactId
-    code <- getConnectionCode (contactConnId ct)
-    ct' <- case contactSecurityCode ct of
-      Just SecurityCode {securityCode}
-        | sameVerificationCode code securityCode -> pure ct
-        | otherwise -> do
-          withStore' $ \db -> setConnectionVerified db user connId Nothing
-          pure (ct :: Contact) {activeConn = conn {connectionCode = Nothing}}
-      _ -> pure ct
-    pure $ CRContactCode user ct' code
+    ct@Contact {activeConn} <- withStore $ \db -> getContact db user contactId
+    case activeConn of
+      Just conn@Connection {connId} -> do
+        code <- getConnectionCode $ aConnId conn
+        ct' <- case contactSecurityCode ct of
+          Just SecurityCode {securityCode}
+            | sameVerificationCode code securityCode -> pure ct
+            | otherwise -> do
+              withStore' $ \db -> setConnectionVerified db user connId Nothing
+              pure (ct :: Contact) {activeConn = Just $ (conn :: Connection) {connectionCode = Nothing}}
+          _ -> pure ct
+        pure $ CRContactCode user ct' code
+      Nothing -> throwChatError $ CEContactNotActive ct
   APIGetGroupMemberCode gId gMemberId -> withUser $ \user -> do
     (g, m@GroupMember {activeConn}) <- withStore $ \db -> (,) <$> getGroupInfo db user gId <*> getGroupMember db user gId gMemberId
     case activeConn of
@@ -1317,17 +1334,22 @@ processChatCommand = \case
         pure $ CRGroupMemberCode user g m' code
       _ -> throwChatError CEGroupMemberNotActive
   APIVerifyContact contactId code -> withUser $ \user -> do
-    Contact {activeConn} <- withStore $ \db -> getContact db user contactId
-    verifyConnectionCode user activeConn code
+    ct@Contact {activeConn} <- withStore $ \db -> getContact db user contactId
+    case activeConn of
+      Just conn -> verifyConnectionCode user conn code
+      Nothing -> throwChatError $ CEContactNotActive ct
   APIVerifyGroupMember gId gMemberId code -> withUser $ \user -> do
     GroupMember {activeConn} <- withStore $ \db -> getGroupMember db user gId gMemberId
     case activeConn of
       Just conn -> verifyConnectionCode user conn code
       _ -> throwChatError CEGroupMemberNotActive
   APIEnableContact contactId -> withUser $ \user -> do
-    Contact {activeConn} <- withStore $ \db -> getContact db user contactId
-    withStore' $ \db -> setConnectionAuthErrCounter db user activeConn 0
-    ok user
+    ct@Contact {activeConn} <- withStore $ \db -> getContact db user contactId
+    case activeConn of
+      Just conn -> do
+        withStore' $ \db -> setConnectionAuthErrCounter db user conn 0
+        ok user
+      Nothing -> throwChatError $ CEContactNotActive ct
   APIEnableGroupMember gId gMemberId -> withUser $ \user -> do
     GroupMember {activeConn} <- withStore $ \db -> getGroupMember db user gId gMemberId
     case activeConn of
@@ -1588,16 +1610,19 @@ processChatCommand = \case
         inv@ReceivedGroupInvitation {fromMember} <- getGroupInvitation db user groupId
         (inv,) <$> getContactViaMember db user fromMember
       let ReceivedGroupInvitation {fromMember, connRequest, groupInfo = g@GroupInfo {membership}} = invitation
-          Contact {activeConn = Connection {peerChatVRange}} = ct
-      subMode <- chatReadVar subscriptionMode
-      dm <- directMessage $ XGrpAcpt membership.memberId
-      agentConnId <- withAgent $ \a -> joinConnection a (aUserId user) True connRequest dm subMode
-      withStore' $ \db -> do
-        createMemberConnection db userId fromMember agentConnId (fromJVersionRange peerChatVRange) subMode
-        updateGroupMemberStatus db userId fromMember GSMemAccepted
-        updateGroupMemberStatus db userId membership GSMemAccepted
-      updateCIGroupInvitationStatus user
-      pure $ CRUserAcceptedGroupSent user g {membership = membership {memberStatus = GSMemAccepted}} Nothing
+          Contact {activeConn} = ct
+      case activeConn of
+        Just Connection {peerChatVRange} -> do
+          subMode <- chatReadVar subscriptionMode
+          dm <- directMessage $ XGrpAcpt membership.memberId
+          agentConnId <- withAgent $ \a -> joinConnection a (aUserId user) True connRequest dm subMode
+          withStore' $ \db -> do
+            createMemberConnection db userId fromMember agentConnId (fromJVersionRange peerChatVRange) subMode
+            updateGroupMemberStatus db userId fromMember GSMemAccepted
+            updateGroupMemberStatus db userId membership GSMemAccepted
+          updateCIGroupInvitationStatus user
+          pure $ CRUserAcceptedGroupSent user g {membership = membership {memberStatus = GSMemAccepted}} Nothing
+        Nothing -> throwChatError $ CEContactNotActive ct
     where
       updateCIGroupInvitationStatus user = do
         AChatItem _ _ cInfo ChatItem {content, meta = CIMeta {itemId}} <- withStore $ \db -> getChatItemByGroupId db user groupId
@@ -2113,7 +2138,8 @@ processChatCommand = \case
               void $ sendDirectContactMessage ct' (XInfo mergedProfile')
               when (directOrUsed ct') $ createSndFeatureItems user' ct ct'
     updateContactPrefs :: User -> Contact -> Preferences -> m ChatResponse
-    updateContactPrefs user@User {userId} ct@Contact {activeConn = Connection {customUserProfileId}, userPreferences = contactUserPrefs} contactUserPrefs'
+    updateContactPrefs _ ct@Contact {activeConn = Nothing} _ = throwChatError $ CEContactNotActive ct
+    updateContactPrefs user@User {userId} ct@Contact {activeConn = Just Connection {customUserProfileId}, userPreferences = contactUserPrefs} contactUserPrefs'
       | contactUserPrefs == contactUserPrefs' = pure $ CRContactPrefsUpdated user ct ct
       | otherwise = do
         assertDirectAllowed user MDSnd ct XInfo_
@@ -2631,8 +2657,8 @@ acceptContactRequestAsync user UserContactRequest {agentInvitationId = AgentInvI
   let profileToSend = profileToSendOnAccept user incognitoProfile
   (cmdId, acId) <- agentAcceptContactAsync user True invId (XInfo profileToSend) subMode
   withStore' $ \db -> do
-    ct@Contact {activeConn = Connection {connId}} <- createAcceptedContact db user acId (fromJVersionRange cReqChatVRange) cName profileId p userContactLinkId xContactId incognitoProfile subMode
-    setCommandConnId db user cmdId connId
+    ct@Contact {activeConn} <- createAcceptedContact db user acId (fromJVersionRange cReqChatVRange) cName profileId p userContactLinkId xContactId incognitoProfile subMode
+    forM_ activeConn $ \Connection {connId} -> setCommandConnId db user cmdId connId
     pure ct
 
 acceptGroupJoinRequestAsync :: ChatMonad m => User -> GroupInfo -> UserContactRequest -> GroupMemberRole -> Maybe IncognitoProfile -> m GroupMember
@@ -2753,7 +2779,7 @@ subscribeUserConnections onlyNeeded agentBatchSubscribe user@User {userId} = do
     getContactConns :: m ([ConnId], Map ConnId Contact)
     getContactConns = do
       cts <- withStore_ ("subscribeUserConnections " <> show userId <> ", getUserContacts") getUserContacts
-      let connIds = map contactConnId (filter contactActive cts)
+      let connIds = catMaybes $ map contactConnId (filter contactActive cts)
       pure (connIds, M.fromList $ zip connIds cts)
     getUserContactLinkConns :: m ([ConnId], Map ConnId UserContact)
     getUserContactLinkConns = do
@@ -2794,9 +2820,10 @@ subscribeUserConnections onlyNeeded agentBatchSubscribe user@User {userId} = do
           toView $ CRNetworkStatuses (Just user) $ map (uncurry ConnNetworkStatus) statuses
           where
             addStatus :: ConnId -> Contact -> [(AgentConnId, NetworkStatus)] -> [(AgentConnId, NetworkStatus)]
-            addStatus connId ct =
-              let ns = (contactAgentConnId ct, netStatus $ resultErr connId rs)
-              in (ns :)
+            addStatus _ Contact {activeConn = Nothing} nss = nss
+            addStatus connId Contact {activeConn = Just Connection {agentConnId}} nss =
+              let ns = (agentConnId, netStatus $ resultErr connId rs)
+              in ns : nss
             netStatus :: Maybe ChatError -> NetworkStatus
             netStatus = maybe NSConnected $ NSError . errorNetworkStatus
             errorNetworkStatus :: ChatError -> String
@@ -3239,7 +3266,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
           cmdId <- createAckCmd conn
           withAckMessage agentConnId cmdId msgMeta $ do
             (conn', msg@RcvMessage {chatMsgEvent = ACME _ event}) <- saveRcvMSG conn (ConnectionId connId) msgMeta msgBody cmdId
-            let ct' = ct {activeConn = conn'} :: Contact
+            let ct' = ct {activeConn = Just conn'} :: Contact
             assertDirectAllowed user MDRcv ct' $ toCMEventTag event
             updateChatLock "directMessage" event
             case event of
@@ -3347,7 +3374,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
             (RSAllowed, _, Just cryptoErr) -> processErr cryptoErr
             (RSAgreed, Just _, _) -> do
               withStore' $ \db -> setConnectionVerified db user connId Nothing
-              let ct' = ct {activeConn = conn {connectionCode = Nothing}} :: Contact
+              let ct' = ct {activeConn = Just $ (conn :: Connection) {connectionCode = Nothing}} :: Contact
               ratchetSyncEventItem ct'
               securityCodeChanged ct'
             _ -> ratchetSyncEventItem ct
@@ -3500,11 +3527,12 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
                 notifyMemberConnected gInfo m Nothing
                 let connectedIncognito = memberIncognito membership
                 when (memberCategory m == GCPreMember) $ probeMatchingMemberContact m connectedIncognito
-              Just ct@Contact {activeConn = Connection {connStatus}} ->
-                when (connStatus == ConnReady) $ do
-                  notifyMemberConnected gInfo m $ Just ct
-                  let connectedIncognito = contactConnIncognito ct || incognitoMembership gInfo
-                  when (memberCategory m == GCPreMember) $ probeMatchingContactsAndMembers ct connectedIncognito True
+              Just ct@Contact {activeConn} ->
+                forM_ activeConn $ \Connection {connStatus} ->
+                  when (connStatus == ConnReady) $ do
+                    notifyMemberConnected gInfo m $ Just ct
+                    let connectedIncognito = contactConnIncognito ct || incognitoMembership gInfo
+                    when (memberCategory m == GCPreMember) $ probeMatchingContactsAndMembers ct connectedIncognito True
       MSG msgMeta _msgFlags msgBody -> do
         cmdId <- createAckCmd conn
         withAckMessage agentConnId cmdId msgMeta $ do
@@ -4315,7 +4343,7 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
           _ -> do
             event <- withStore $ \db -> do
               ci' <- updateDirectCIFileStatus db user fileId $ CIFSSndTransfer 0 1
-              sft <- liftIO $ createSndDirectInlineFT db ct ft
+              sft <- createSndDirectInlineFT db ct ft
               pure $ CRSndFileStart user ci' sft
             toView event
             ifM
@@ -4431,30 +4459,31 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
 
     processGroupInvitation :: Contact -> GroupInvitation -> RcvMessage -> MsgMeta -> m ()
     processGroupInvitation ct inv msg msgMeta = do
-      let Contact {localDisplayName = c, activeConn = Connection {connId, peerChatVRange, customUserProfileId, groupLinkId = groupLinkId'}} = ct
+      let Contact {localDisplayName = c, activeConn} = ct
           GroupInvitation {fromMember = (MemberIdRole fromMemId fromRole), invitedMember = (MemberIdRole memId memRole), connRequest, groupLinkId} = inv
-      checkIntegrityCreateItem (CDDirectRcv ct) msgMeta
-      when (fromRole < GRAdmin || fromRole < memRole) $ throwChatError (CEGroupContactRole c)
-      when (fromMemId == memId) $ throwChatError CEGroupDuplicateMemberId
-      -- [incognito] if direct connection with host is incognito, create membership using the same incognito profile
-      (gInfo@GroupInfo {groupId, localDisplayName, groupProfile, membership = membership@GroupMember {groupMemberId, memberId}}, hostId) <- withStore $ \db -> createGroupInvitation db user ct inv customUserProfileId
-      if sameGroupLinkId groupLinkId groupLinkId'
-        then do
-          subMode <- chatReadVar subscriptionMode
-          dm <- directMessage $ XGrpAcpt memberId
-          connIds <- joinAgentConnectionAsync user True connRequest dm subMode
-          withStore' $ \db -> do
-            setViaGroupLinkHash db groupId connId
-            createMemberConnectionAsync db user hostId connIds (fromJVersionRange peerChatVRange) subMode
-            updateGroupMemberStatusById db userId hostId GSMemAccepted
-            updateGroupMemberStatus db userId membership GSMemAccepted
-          toView $ CRUserAcceptedGroupSent user gInfo {membership = membership {memberStatus = GSMemAccepted}} (Just ct)
-        else do
-          let content = CIRcvGroupInvitation (CIGroupInvitation {groupId, groupMemberId, localDisplayName, groupProfile, status = CIGISPending}) memRole
-          ci <- saveRcvChatItem user (CDDirectRcv ct) msg msgMeta content
-          withStore' $ \db -> setGroupInvitationChatItemId db user groupId (chatItemId' ci)
-          toView $ CRNewChatItem user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci)
-          toView $ CRReceivedGroupInvitation {user, groupInfo = gInfo, contact = ct, fromMemberRole = fromRole, memberRole = memRole}
+      forM_ activeConn $ \Connection {connId, peerChatVRange, customUserProfileId, groupLinkId = groupLinkId'} -> do
+        checkIntegrityCreateItem (CDDirectRcv ct) msgMeta
+        when (fromRole < GRAdmin || fromRole < memRole) $ throwChatError (CEGroupContactRole c)
+        when (fromMemId == memId) $ throwChatError CEGroupDuplicateMemberId
+        -- [incognito] if direct connection with host is incognito, create membership using the same incognito profile
+        (gInfo@GroupInfo {groupId, localDisplayName, groupProfile, membership = membership@GroupMember {groupMemberId, memberId}}, hostId) <- withStore $ \db -> createGroupInvitation db user ct inv customUserProfileId
+        if sameGroupLinkId groupLinkId groupLinkId'
+          then do
+            subMode <- chatReadVar subscriptionMode
+            dm <- directMessage $ XGrpAcpt memberId
+            connIds <- joinAgentConnectionAsync user True connRequest dm subMode
+            withStore' $ \db -> do
+              setViaGroupLinkHash db groupId connId
+              createMemberConnectionAsync db user hostId connIds (fromJVersionRange peerChatVRange) subMode
+              updateGroupMemberStatusById db userId hostId GSMemAccepted
+              updateGroupMemberStatus db userId membership GSMemAccepted
+            toView $ CRUserAcceptedGroupSent user gInfo {membership = membership {memberStatus = GSMemAccepted}} (Just ct)
+          else do
+            let content = CIRcvGroupInvitation (CIGroupInvitation {groupId, groupMemberId, localDisplayName, groupProfile, status = CIGISPending}) memRole
+            ci <- saveRcvChatItem user (CDDirectRcv ct) msg msgMeta content
+            withStore' $ \db -> setGroupInvitationChatItemId db user groupId (chatItemId' ci)
+            toView $ CRNewChatItem user (AChatItem SCTDirect SMDRcv (DirectChat ct) ci)
+            toView $ CRReceivedGroupInvitation {user, groupInfo = gInfo, contact = ct, fromMemberRole = fromRole, memberRole = memRole}
       where
         sameGroupLinkId :: Maybe GroupLinkId -> Maybe GroupLinkId -> Bool
         sameGroupLinkId (Just gli) (Just gli') = gli == gli'
@@ -4477,7 +4506,8 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
           contactConns <- withStore $ \db -> getContactConnections db userId ct'
           deleteAgentConnectionsAsync user $ map aConnId contactConns
           forM_ contactConns $ \conn -> withStore' $ \db -> updateConnectionStatus db conn ConnDeleted
-          let ct'' = ct' {activeConn = (contactConn ct') {connStatus = ConnDeleted}} :: Contact
+          activeConn' <- forM (contactConn ct') $ \conn -> pure conn {connStatus = ConnDeleted}
+          let ct'' = ct' {activeConn = activeConn'} :: Contact
           ci <- saveRcvChatItem user (CDDirectRcv ct'') msg msgMeta (CIRcvDirectEvent RDEContactDeleted)
           toView $ CRNewChatItem user (AChatItem SCTDirect SMDRcv (DirectChat ct'') ci)
           toView $ CRContactDeletedByContact user ct''
@@ -4987,20 +5017,21 @@ processAgentMessageConn user@User {userId} corrId agentConnId agentMessage = do
         Nothing -> createNewContact subMode
         Just mContactId -> do
           mCt <- withStore $ \db -> getContact db user mContactId
-          let Contact {activeConn = Connection {connId}, contactGrpInvSent} = mCt
-          if contactGrpInvSent
-            then do
-              ownConnReq <- withStore $ \db -> getConnReqInv db connId
-              -- in case both members sent x.grp.direct.inv before receiving other's for processing,
-              -- only the one who received greater connReq joins, the other creates items and waits for confirmation
-              if strEncode connReq > strEncode ownConnReq
-                then joinExistingContact subMode mCt
-                else createItems mCt m
-            else joinExistingContact subMode mCt
+          let Contact {activeConn, contactGrpInvSent} = mCt
+          forM_ activeConn $ \Connection {connId} ->
+            if contactGrpInvSent
+              then do
+                ownConnReq <- withStore $ \db -> getConnReqInv db connId
+                -- in case both members sent x.grp.direct.inv before receiving other's for processing,
+                -- only the one who received greater connReq joins, the other creates items and waits for confirmation
+                if strEncode connReq > strEncode ownConnReq
+                  then joinExistingContact subMode mCt
+                  else createItems mCt m
+              else joinExistingContact subMode mCt
       where
         joinExistingContact subMode mCt = do
           connIds <- joinConn subMode
-          mCt' <- withStore' $ \db -> updateMemberContactInvited db user connIds g mConn mCt subMode
+          mCt' <- withStore $ \db -> updateMemberContactInvited db user connIds g mConn mCt subMode
           createItems mCt' m
           securityCodeChanged mCt'
         createNewContact subMode = do
@@ -5090,7 +5121,7 @@ parseFileDescription =
 sendDirectFileInline :: ChatMonad m => Contact -> FileTransferMeta -> SharedMsgId -> m ()
 sendDirectFileInline ct ft sharedMsgId = do
   msgDeliveryId <- sendFileInline_ ft sharedMsgId $ sendDirectContactMessage ct
-  withStore' $ \db -> updateSndDirectFTDelivery db ct ft msgDeliveryId
+  withStore $ \db -> updateSndDirectFTDelivery db ct ft msgDeliveryId
 
 sendMemberFileInline :: ChatMonad m => GroupMember -> Connection -> FileTransferMeta -> SharedMsgId -> m ()
 sendMemberFileInline m@GroupMember {groupId} conn ft sharedMsgId = do
@@ -5280,7 +5311,8 @@ deleteOrUpdateMemberRecord user@User {userId} member =
       Nothing -> deleteGroupMember db user member
 
 sendDirectContactMessage :: (MsgEncodingI e, ChatMonad m) => Contact -> ChatMsgEvent e -> m (SndMessage, Int64)
-sendDirectContactMessage ct@Contact {activeConn = conn@Connection {connId, connStatus}, contactStatus} chatMsgEvent
+sendDirectContactMessage ct@Contact {activeConn = Nothing} _ = throwChatError $ CEContactNotReady ct
+sendDirectContactMessage ct@Contact {activeConn = Just conn@Connection {connId, connStatus}, contactStatus} chatMsgEvent
   | connStatus /= ConnReady && connStatus /= ConnSndReady = throwChatError $ CEContactNotReady ct
   | contactStatus /= CSActive = throwChatError $ CEContactNotActive ct
   | connDisabled conn = throwChatError $ CEContactDisabled ct
diff --git a/src/Simplex/Chat/Controller.hs b/src/Simplex/Chat/Controller.hs
index 77976da05..06a421f60 100644
--- a/src/Simplex/Chat/Controller.hs
+++ b/src/Simplex/Chat/Controller.hs
@@ -488,7 +488,7 @@ data ChatResponse
   | CRServerTestResult {user :: User, testServer :: AProtoServerWithAuth, testFailure :: Maybe ProtocolTestFailure}
   | CRChatItemTTL {user :: User, chatItemTTL :: Maybe Int64}
   | CRNetworkConfig {networkConfig :: NetworkConfig}
-  | CRContactInfo {user :: User, contact :: Contact, connectionStats :: ConnectionStats, customUserProfile :: Maybe Profile}
+  | CRContactInfo {user :: User, contact :: Contact, connectionStats_ :: Maybe ConnectionStats, customUserProfile :: Maybe Profile}
   | CRGroupInfo {user :: User, groupInfo :: GroupInfo, groupSummary :: GroupSummary}
   | CRGroupMemberInfo {user :: User, groupInfo :: GroupInfo, member :: GroupMember, connectionStats_ :: Maybe ConnectionStats}
   | CRContactSwitchStarted {user :: User, contact :: Contact, connectionStats :: ConnectionStats}
@@ -1103,7 +1103,8 @@ chatModifyVar f newValue = asks f >>= atomically . (`modifyTVar'` newValue)
 {-# INLINE chatModifyVar #-}
 
 setContactNetworkStatus :: ChatMonad' m => Contact -> NetworkStatus -> m ()
-setContactNetworkStatus ct = chatModifyVar connNetworkStatuses . M.insert (contactAgentConnId ct)
+setContactNetworkStatus Contact {activeConn = Nothing} _ = pure ()
+setContactNetworkStatus Contact {activeConn = Just Connection {agentConnId}} status = chatModifyVar connNetworkStatuses $ M.insert agentConnId status
 
 tryChatError :: ChatMonad m => m a -> m (Either ChatError a)
 tryChatError = tryAllErrors mkChatError
diff --git a/src/Simplex/Chat/Protocol.hs b/src/Simplex/Chat/Protocol.hs
index 99779d820..008339aa2 100644
--- a/src/Simplex/Chat/Protocol.hs
+++ b/src/Simplex/Chat/Protocol.hs
@@ -80,7 +80,7 @@ $(JQ.deriveJSON (sumTypeJSON fstToLower) ''ConnectionEntity)
 
 updateEntityConnStatus :: ConnectionEntity -> ConnStatus -> ConnectionEntity
 updateEntityConnStatus connEntity connStatus = case connEntity of
-  RcvDirectMsgConnection c ct_ -> RcvDirectMsgConnection (st c) ((\ct -> (ct :: Contact) {activeConn = st c}) <$> ct_)
+  RcvDirectMsgConnection c ct_ -> RcvDirectMsgConnection (st c) ((\ct -> (ct :: Contact) {activeConn = Just $ st c}) <$> ct_)
   RcvGroupMsgConnection c gInfo m@GroupMember {activeConn = c'} -> RcvGroupMsgConnection (st c) gInfo m {activeConn = st <$> c'}
   SndFileConnection c ft -> SndFileConnection (st c) ft
   RcvFileConnection c ft -> RcvFileConnection (st c) ft
diff --git a/src/Simplex/Chat/Store/Connections.hs b/src/Simplex/Chat/Store/Connections.hs
index d73ac705d..b5b377ea5 100644
--- a/src/Simplex/Chat/Store/Connections.hs
+++ b/src/Simplex/Chat/Store/Connections.hs
@@ -81,10 +81,11 @@ getConnectionEntity db user@User {userId, userContactId} agentConnId = do
           |]
           (userId, contactId)
     toContact' :: Int64 -> Connection -> [(ProfileId, ContactName, Text, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, Maybe Int64, Bool, ContactStatus) :. (Maybe MsgFilter, Maybe Bool, Bool, Maybe Preferences, Preferences, UTCTime, UTCTime, Maybe UTCTime, Maybe GroupMemberId, Bool)] -> Either StoreError Contact
-    toContact' contactId activeConn [(profileId, localDisplayName, displayName, fullName, image, contactLink, localAlias, viaGroup, contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, favorite, preferences, userPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent)] =
+    toContact' contactId conn [(profileId, localDisplayName, displayName, fullName, image, contactLink, localAlias, viaGroup, contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, favorite, preferences, userPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent)] =
       let profile = LocalProfile {profileId, displayName, fullName, image, contactLink, preferences, localAlias}
           chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts, favorite}
-          mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito activeConn
+          mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito conn
+          activeConn = Just conn
        in Right Contact {contactId, localDisplayName, profile, activeConn, viaGroup, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent}
     toContact' _ _ _ = Left $ SEInternalError "referenced contact not found"
     getGroupAndMember_ :: Int64 -> Connection -> ExceptT StoreError IO (GroupInfo, GroupMember)
diff --git a/src/Simplex/Chat/Store/Direct.hs b/src/Simplex/Chat/Store/Direct.hs
index 477361acd..ba420b980 100644
--- a/src/Simplex/Chat/Store/Direct.hs
+++ b/src/Simplex/Chat/Store/Direct.hs
@@ -194,13 +194,13 @@ createIncognitoProfile db User {userId} p = do
   createIncognitoProfile_ db userId createdAt p
 
 createDirectContact :: DB.Connection -> User -> Connection -> Profile -> ExceptT StoreError IO Contact
-createDirectContact db user@User {userId} activeConn@Connection {connId, localAlias} p@Profile {preferences} = do
+createDirectContact db user@User {userId} conn@Connection {connId, localAlias} p@Profile {preferences} = do
   createdAt <- liftIO getCurrentTime
   (localDisplayName, contactId, profileId) <- createContact_ db userId connId p localAlias Nothing createdAt (Just createdAt)
   let profile = toLocalProfile profileId p localAlias
       userPreferences = emptyChatPrefs
-      mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito activeConn
-  pure $ Contact {contactId, localDisplayName, profile, activeConn, viaGroup = Nothing, contactUsed = False, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt, updatedAt = createdAt, chatTs = Just createdAt, contactGroupMemberId = Nothing, contactGrpInvSent = False}
+      mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito conn
+  pure $ Contact {contactId, localDisplayName, profile, activeConn = Just conn, viaGroup = Nothing, contactUsed = False, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt, updatedAt = createdAt, chatTs = Just createdAt, contactGroupMemberId = Nothing, contactGrpInvSent = False}
 
 deleteContactConnectionsAndFiles :: DB.Connection -> UserId -> Contact -> IO ()
 deleteContactConnectionsAndFiles db userId Contact {contactId} = do
@@ -218,7 +218,7 @@ deleteContactConnectionsAndFiles db userId Contact {contactId} = do
   DB.execute db "DELETE FROM files WHERE user_id = ? AND contact_id = ?" (userId, contactId)
 
 deleteContact :: DB.Connection -> User -> Contact -> IO ()
-deleteContact db user@User {userId} Contact {contactId, localDisplayName, activeConn = Connection {customUserProfileId}} = do
+deleteContact db user@User {userId} Contact {contactId, localDisplayName, activeConn} = do
   DB.execute db "DELETE FROM chat_items WHERE user_id = ? AND contact_id = ?" (userId, contactId)
   ctMember :: (Maybe ContactId) <- maybeFirstRow fromOnly $ DB.query db "SELECT contact_id FROM group_members WHERE user_id = ? AND contact_id = ? LIMIT 1" (userId, contactId)
   if isNothing ctMember
@@ -229,16 +229,20 @@ deleteContact db user@User {userId} Contact {contactId, localDisplayName, active
       currentTs <- getCurrentTime
       DB.execute db "UPDATE group_members SET contact_id = NULL, updated_at = ? WHERE user_id = ? AND contact_id = ?" (currentTs, userId, contactId)
   DB.execute db "DELETE FROM contacts WHERE user_id = ? AND contact_id = ?" (userId, contactId)
-  forM_ customUserProfileId $ \profileId -> deleteUnusedIncognitoProfileById_ db user profileId
+  forM_ activeConn $ \Connection {customUserProfileId} ->
+    forM_ customUserProfileId $ \profileId ->
+      deleteUnusedIncognitoProfileById_ db user profileId
 
 -- should only be used if contact is not member of any groups
 deleteContactWithoutGroups :: DB.Connection -> User -> Contact -> IO ()
-deleteContactWithoutGroups db user@User {userId} Contact {contactId, localDisplayName, activeConn = Connection {customUserProfileId}} = do
+deleteContactWithoutGroups db user@User {userId} Contact {contactId, localDisplayName, activeConn} = do
   DB.execute db "DELETE FROM chat_items WHERE user_id = ? AND contact_id = ?" (userId, contactId)
   deleteContactProfile_ db userId contactId
   DB.execute db "DELETE FROM display_names WHERE user_id = ? AND local_display_name = ?" (userId, localDisplayName)
   DB.execute db "DELETE FROM contacts WHERE user_id = ? AND contact_id = ?" (userId, contactId)
-  forM_ customUserProfileId $ \profileId -> deleteUnusedIncognitoProfileById_ db user profileId
+  forM_ activeConn $ \Connection {customUserProfileId} ->
+    forM_ customUserProfileId $ \profileId ->
+      deleteUnusedIncognitoProfileById_ db user profileId
 
 setContactDeleted :: DB.Connection -> User -> Contact -> IO ()
 setContactDeleted db User {userId} Contact {contactId} = do
@@ -307,19 +311,19 @@ updateContactProfile db user@User {userId} c p'
       updateContact_ db userId contactId localDisplayName ldn currentTs
       pure $ Right c {localDisplayName = ldn, profile, mergedPreferences}
   where
-    Contact {contactId, localDisplayName, profile = LocalProfile {profileId, displayName, localAlias}, activeConn, userPreferences} = c
+    Contact {contactId, localDisplayName, profile = LocalProfile {profileId, displayName, localAlias}, userPreferences} = c
     Profile {displayName = newName, preferences} = p'
     profile = toLocalProfile profileId p' localAlias
-    mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito activeConn
+    mergedPreferences = contactUserPreferences user userPreferences preferences $ contactConnIncognito c
 
 updateContactUserPreferences :: DB.Connection -> User -> Contact -> Preferences -> IO Contact
-updateContactUserPreferences db user@User {userId} c@Contact {contactId, activeConn} userPreferences = do
+updateContactUserPreferences db user@User {userId} c@Contact {contactId} userPreferences = do
   updatedAt <- getCurrentTime
   DB.execute
     db
     "UPDATE contacts SET user_preferences = ?, updated_at = ? WHERE user_id = ? AND contact_id = ?"
     (userPreferences, updatedAt, userId, contactId)
-  let mergedPreferences = contactUserPreferences user userPreferences (preferences' c) $ connIncognito activeConn
+  let mergedPreferences = contactUserPreferences user userPreferences (preferences' c) $ contactConnIncognito c
   pure $ c {mergedPreferences, userPreferences}
 
 updateContactAlias :: DB.Connection -> UserId -> Contact -> LocalAlias -> IO Contact
@@ -453,7 +457,8 @@ getContactByName db user localDisplayName = do
 getUserContacts :: DB.Connection -> User -> IO [Contact]
 getUserContacts db user@User {userId} = do
   contactIds <- map fromOnly <$> DB.query db "SELECT contact_id FROM contacts WHERE user_id = ? AND deleted = 0" (Only userId)
-  rights <$> mapM (runExceptT . getContact db user) contactIds
+  contacts <- rights <$> mapM (runExceptT . getContact db user) contactIds
+  pure $ filter (\Contact {activeConn} -> isJust activeConn) contacts
 
 createOrUpdateContactRequest :: DB.Connection -> User -> Int64 -> InvitationId -> VersionRange -> Profile -> Maybe XContactId -> ExceptT StoreError IO ContactOrRequest
 createOrUpdateContactRequest db user@User {userId} userContactLinkId invId (VersionRange minV maxV) Profile {displayName, fullName, image, contactLink, preferences} xContactId_ =
@@ -642,9 +647,9 @@ createAcceptedContact db user@User {userId, profile = LocalProfile {preferences}
     "INSERT INTO contacts (user_id, local_display_name, contact_profile_id, enable_ntfs, user_preferences, created_at, updated_at, chat_ts, xcontact_id) VALUES (?,?,?,?,?,?,?,?,?)"
     (userId, localDisplayName, profileId, True, userPreferences, createdAt, createdAt, createdAt, xContactId)
   contactId <- insertedRowId db
-  activeConn <- createConnection_ db userId ConnContact (Just contactId) agentConnId cReqChatVRange Nothing (Just userContactLinkId) customUserProfileId 0 createdAt subMode
-  let mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito activeConn
-  pure $ Contact {contactId, localDisplayName, profile = toLocalProfile profileId profile "", activeConn, viaGroup = Nothing, contactUsed = False, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = createdAt, updatedAt = createdAt, chatTs = Just createdAt, contactGroupMemberId = Nothing, contactGrpInvSent = False}
+  conn <- createConnection_ db userId ConnContact (Just contactId) agentConnId cReqChatVRange Nothing (Just userContactLinkId) customUserProfileId 0 createdAt subMode
+  let mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito conn
+  pure $ Contact {contactId, localDisplayName, profile = toLocalProfile profileId profile "", activeConn = Just conn, viaGroup = Nothing, contactUsed = False, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = createdAt, updatedAt = createdAt, chatTs = Just createdAt, contactGroupMemberId = Nothing, contactGrpInvSent = False}
 
 getContactIdByName :: DB.Connection -> User -> ContactName -> ExceptT StoreError IO Int64
 getContactIdByName db User {userId} cName =
@@ -656,7 +661,7 @@ getContact db user contactId = getContact_ db user contactId False
 
 getContact_ :: DB.Connection -> User -> Int64 -> Bool -> ExceptT StoreError IO Contact
 getContact_ db user@User {userId} contactId deleted =
-  ExceptT . fmap join . firstRow (toContactOrError user) (SEContactNotFound contactId) $
+  ExceptT . firstRow (toContact user) (SEContactNotFound contactId) $
     DB.query
       db
       [sql|
diff --git a/src/Simplex/Chat/Store/Files.hs b/src/Simplex/Chat/Store/Files.hs
index 95e586919..a42e55a25 100644
--- a/src/Simplex/Chat/Store/Files.hs
+++ b/src/Simplex/Chat/Store/Files.hs
@@ -209,8 +209,9 @@ createSndGroupFileTransferConnection db user@User {userId} fileId (cmdId, acId)
     "INSERT INTO snd_files (file_id, file_status, connection_id, group_member_id, created_at, updated_at) VALUES (?,?,?,?,?,?)"
     (fileId, FSAccepted, connId, groupMemberId, currentTs, currentTs)
 
-createSndDirectInlineFT :: DB.Connection -> Contact -> FileTransferMeta -> IO SndFileTransfer
-createSndDirectInlineFT db Contact {localDisplayName = n, activeConn = Connection {connId, agentConnId}} FileTransferMeta {fileId, fileName, filePath, fileSize, chunkSize, fileInline} = do
+createSndDirectInlineFT :: DB.Connection -> Contact -> FileTransferMeta -> ExceptT StoreError IO SndFileTransfer
+createSndDirectInlineFT _ Contact {localDisplayName, activeConn = Nothing} _ = throwError $ SEContactNotReady localDisplayName
+createSndDirectInlineFT db Contact {localDisplayName = n, activeConn = Just Connection {connId, agentConnId}} FileTransferMeta {fileId, fileName, filePath, fileSize, chunkSize, fileInline} = liftIO $ do
   currentTs <- getCurrentTime
   let fileStatus = FSConnected
       fileInline' = Just $ fromMaybe IFMOffer fileInline
@@ -231,8 +232,9 @@ createSndGroupInlineFT db GroupMember {groupMemberId, localDisplayName = n} Conn
     (fileId, fileStatus, fileInline', connId, groupMemberId, currentTs, currentTs)
   pure SndFileTransfer {fileId, fileName, filePath, fileSize, chunkSize, recipientDisplayName = n, connId, agentConnId, groupMemberId = Just groupMemberId, fileStatus, fileDescrId = Nothing, fileInline = fileInline'}
 
-updateSndDirectFTDelivery :: DB.Connection -> Contact -> FileTransferMeta -> Int64 -> IO ()
-updateSndDirectFTDelivery db Contact {activeConn = Connection {connId}} FileTransferMeta {fileId} msgDeliveryId =
+updateSndDirectFTDelivery :: DB.Connection -> Contact -> FileTransferMeta -> Int64 -> ExceptT StoreError IO ()
+updateSndDirectFTDelivery _ Contact {localDisplayName, activeConn = Nothing} _ _ = throwError $ SEContactNotReady localDisplayName
+updateSndDirectFTDelivery db Contact {activeConn = Just Connection {connId}} FileTransferMeta {fileId} msgDeliveryId = liftIO $
   DB.execute
     db
     "UPDATE snd_files SET last_inline_msg_delivery_id = ? WHERE connection_id = ? AND file_id = ? AND file_inline IS NOT NULL"
diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs
index bddca0deb..09c59eee6 100644
--- a/src/Simplex/Chat/Store/Groups.hs
+++ b/src/Simplex/Chat/Store/Groups.hs
@@ -314,7 +314,8 @@ createNewGroup db gVar user@User {userId} groupProfile incognitoProfile = Except
 
 -- | creates a new group record for the group the current user was invited to, or returns an existing one
 createGroupInvitation :: DB.Connection -> User -> Contact -> GroupInvitation -> Maybe ProfileId -> ExceptT StoreError IO (GroupInfo, GroupMemberId)
-createGroupInvitation db user@User {userId} contact@Contact {contactId, activeConn = Connection {customUserProfileId}} GroupInvitation {fromMember, invitedMember, connRequest, groupProfile} incognitoProfileId = do
+createGroupInvitation _ _ Contact {localDisplayName, activeConn = Nothing} _ _ = throwError $ SEContactNotReady localDisplayName
+createGroupInvitation db user@User {userId} contact@Contact {contactId, activeConn = Just Connection {customUserProfileId}} GroupInvitation {fromMember, invitedMember, connRequest, groupProfile} incognitoProfileId = do
   liftIO getInvitationGroupId_ >>= \case
     Nothing -> createGroupInvitation_
     Just gId -> do
@@ -705,7 +706,8 @@ getGroupInvitation db user groupId =
         DB.query db "SELECT g.inv_queue_info FROM groups g WHERE g.group_id = ? AND g.user_id = ?" (groupId, userId)
 
 createNewContactMember :: DB.Connection -> TVar ChaChaDRG -> User -> GroupId -> Contact -> GroupMemberRole -> ConnId -> ConnReqInvitation -> SubscriptionMode -> ExceptT StoreError IO GroupMember
-createNewContactMember db gVar User {userId, userContactId} groupId Contact {contactId, localDisplayName, profile, activeConn = Connection {peerChatVRange}} memberRole agentConnId connRequest subMode =
+createNewContactMember _ _ _ _ Contact {localDisplayName, activeConn = Nothing} _ _ _ _ = throwError $ SEContactNotReady localDisplayName
+createNewContactMember db gVar User {userId, userContactId} groupId Contact {contactId, localDisplayName, profile, activeConn = Just Connection {peerChatVRange}} memberRole agentConnId connRequest subMode =
   createWithRandomId gVar $ \memId -> do
     createdAt <- liftIO getCurrentTime
     member@GroupMember {groupMemberId} <- createMember_ (MemberId memId) createdAt
@@ -1725,15 +1727,15 @@ createMemberContact
     connId <- insertedRowId db
     let ctConn = Connection {connId, agentConnId = AgentConnId acId, peerChatVRange, connType = ConnContact, contactConnInitiated = True, entityId = Just contactId, viaContact = Nothing, viaUserContactLink = Nothing, viaGroupLink = False, groupLinkId = Nothing, customUserProfileId, connLevel, connStatus = ConnNew, localAlias = "", createdAt = currentTs, connectionCode = Nothing, authErrCounter = 0}
         mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito ctConn
-    pure Contact {contactId, localDisplayName, profile = memberProfile, activeConn = ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Just groupMemberId, contactGrpInvSent = False}
+    pure Contact {contactId, localDisplayName, profile = memberProfile, activeConn = Just ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Just groupMemberId, contactGrpInvSent = False}
 
 getMemberContact :: DB.Connection -> User -> ContactId -> ExceptT StoreError IO (GroupInfo, GroupMember, Contact, ConnReqInvitation)
 getMemberContact db user contactId = do
   ct <- getContact db user contactId
-  let Contact {contactGroupMemberId, activeConn = Connection {connId}} = ct
-  cReq <- getConnReqInv db connId
-  case contactGroupMemberId of
-    Just groupMemberId -> do
+  let Contact {contactGroupMemberId, activeConn} = ct
+  case (activeConn, contactGroupMemberId) of
+    (Just Connection {connId}, Just groupMemberId) -> do
+      cReq <- getConnReqInv db connId
       m@GroupMember {groupId} <- getGroupMemberById db user groupMemberId
       g <- getGroupInfo db user groupId
       pure (g, m, ct, cReq)
@@ -1762,7 +1764,7 @@ createMemberContactInvited
     contactId <- createContactUpdateMember currentTs userPreferences
     ctConn <- createMemberContactConn_ db user connIds gInfo mConn contactId subMode
     let mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito ctConn
-        mCt' = Contact {contactId, localDisplayName = memberLDN, profile = memberProfile, activeConn = ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Nothing, contactGrpInvSent = False}
+        mCt' = Contact {contactId, localDisplayName = memberLDN, profile = memberProfile, activeConn = Just ctConn, viaGroup = Nothing, contactUsed = True, contactStatus = CSActive, chatSettings = defaultChatSettings, userPreferences, mergedPreferences, createdAt = currentTs, updatedAt = currentTs, chatTs = Just currentTs, contactGroupMemberId = Nothing, contactGrpInvSent = False}
         m' = m {memberContactId = Just contactId}
     pure (mCt', m')
     where
@@ -1786,13 +1788,14 @@ createMemberContactInvited
           (contactId, currentTs, groupMemberId)
         pure contactId
 
-updateMemberContactInvited :: DB.Connection -> User -> (CommandId, ConnId) -> GroupInfo -> Connection -> Contact -> SubscriptionMode -> IO Contact
-updateMemberContactInvited db user connIds gInfo mConn ct@Contact {contactId, activeConn = oldContactConn} subMode = do
+updateMemberContactInvited :: DB.Connection -> User -> (CommandId, ConnId) -> GroupInfo -> Connection -> Contact -> SubscriptionMode -> ExceptT StoreError IO Contact
+updateMemberContactInvited _ _ _ _ _ Contact {localDisplayName, activeConn = Nothing} _ = throwError $ SEContactNotReady localDisplayName
+updateMemberContactInvited db user connIds gInfo mConn ct@Contact {contactId, activeConn = Just oldContactConn} subMode = liftIO $ do
   updateConnectionStatus db oldContactConn ConnDeleted
-  activeConn <- createMemberContactConn_ db user connIds gInfo mConn contactId subMode
+  activeConn' <- createMemberContactConn_ db user connIds gInfo mConn contactId subMode
   ct' <- updateContactStatus db user ct CSActive
   ct'' <- resetMemberContactFields db ct'
-  pure (ct'' :: Contact) {activeConn}
+  pure (ct'' :: Contact) {activeConn = Just activeConn'}
 
 resetMemberContactFields :: DB.Connection -> Contact -> IO Contact
 resetMemberContactFields db ct@Contact {contactId} = do
diff --git a/src/Simplex/Chat/Store/Messages.hs b/src/Simplex/Chat/Store/Messages.hs
index fe3c39dd8..b2f83cc1d 100644
--- a/src/Simplex/Chat/Store/Messages.hs
+++ b/src/Simplex/Chat/Store/Messages.hs
@@ -497,7 +497,7 @@ getDirectChatPreviews_ db user@User {userId} = do
           ri.chat_item_id, i.quoted_shared_msg_id, i.quoted_sent_at, i.quoted_content, i.quoted_sent
         FROM contacts ct
         JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
-        JOIN connections c ON c.contact_id = ct.contact_id
+        LEFT JOIN connections c ON c.contact_id = ct.contact_id
         LEFT JOIN (
           SELECT contact_id, MAX(chat_item_id) AS MaxId
           FROM chat_items
@@ -514,25 +514,31 @@ getDirectChatPreviews_ db user@User {userId} = do
         ) ChatStats ON ChatStats.contact_id = ct.contact_id
         LEFT JOIN chat_items ri ON ri.user_id = i.user_id AND ri.contact_id = i.contact_id AND ri.shared_msg_id = i.quoted_shared_msg_id
         WHERE ct.user_id = ?
-          AND ((c.conn_level = 0 AND c.via_group_link = 0) OR ct.contact_used = 1)
+          AND ct.is_user = 0
           AND ct.deleted = 0
-          AND c.connection_id = (
-            SELECT cc_connection_id FROM (
-              SELECT
-                cc.connection_id AS cc_connection_id,
-                cc.created_at AS cc_created_at,
-                (CASE WHEN cc.conn_status = ? OR cc.conn_status = ? THEN 1 ELSE 0 END) AS cc_conn_status_ord
-              FROM connections cc
-              WHERE cc.user_id = ct.user_id AND cc.contact_id = ct.contact_id
-              ORDER BY cc_conn_status_ord DESC, cc_created_at DESC
-              LIMIT 1
+          AND (
+            (
+              ((c.conn_level = 0 AND c.via_group_link = 0) OR ct.contact_used = 1)
+              AND c.connection_id = (
+                SELECT cc_connection_id FROM (
+                  SELECT
+                    cc.connection_id AS cc_connection_id,
+                    cc.created_at AS cc_created_at,
+                    (CASE WHEN cc.conn_status = ? OR cc.conn_status = ? THEN 1 ELSE 0 END) AS cc_conn_status_ord
+                  FROM connections cc
+                  WHERE cc.user_id = ct.user_id AND cc.contact_id = ct.contact_id
+                  ORDER BY cc_conn_status_ord DESC, cc_created_at DESC
+                  LIMIT 1
+                )
+              )
             )
+            OR c.connection_id IS NULL
           )
         ORDER BY i.item_ts DESC
       |]
       (CISRcvNew, userId, ConnReady, ConnSndReady)
   where
-    toDirectChatPreview :: UTCTime -> ContactRow :. ConnectionRow :. ChatStatsRow :. MaybeChatItemRow :. QuoteRow -> AChat
+    toDirectChatPreview :: UTCTime -> ContactRow :. MaybeConnectionRow :. ChatStatsRow :. MaybeChatItemRow :. QuoteRow -> AChat
     toDirectChatPreview currentTs (contactRow :. connRow :. statsRow :. ciRow_) =
       let contact = toContact user $ contactRow :. connRow
           ci_ = toDirectChatItemList currentTs ciRow_
diff --git a/src/Simplex/Chat/Store/Shared.hs b/src/Simplex/Chat/Store/Shared.hs
index 7c1f07191..87d0cc416 100644
--- a/src/Simplex/Chat/Store/Shared.hs
+++ b/src/Simplex/Chat/Store/Shared.hs
@@ -253,24 +253,15 @@ deleteUnusedIncognitoProfileById_ db User {userId} profileId =
 
 type ContactRow = (ContactId, ProfileId, ContactName, Maybe Int64, ContactName, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, Bool, ContactStatus) :. (Maybe MsgFilter, Maybe Bool, Bool, Maybe Preferences, Preferences, UTCTime, UTCTime, Maybe UTCTime, Maybe GroupMemberId, Bool)
 
-toContact :: User -> ContactRow :. ConnectionRow -> Contact
+toContact :: User -> ContactRow :. MaybeConnectionRow -> Contact
 toContact user (((contactId, profileId, localDisplayName, viaGroup, displayName, fullName, image, contactLink, localAlias, contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, favorite, preferences, userPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent)) :. connRow) =
   let profile = LocalProfile {profileId, displayName, fullName, image, contactLink, preferences, localAlias}
-      activeConn = toConnection connRow
+      activeConn = toMaybeConnection connRow
       chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts, favorite}
-      mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito activeConn
+      incognito = maybe False connIncognito activeConn
+      mergedPreferences = contactUserPreferences user userPreferences preferences incognito
    in Contact {contactId, localDisplayName, profile, activeConn, viaGroup, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent}
 
-toContactOrError :: User -> ContactRow :. MaybeConnectionRow -> Either StoreError Contact
-toContactOrError user (((contactId, profileId, localDisplayName, viaGroup, displayName, fullName, image, contactLink, localAlias, contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, favorite, preferences, userPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent)) :. connRow) =
-  let profile = LocalProfile {profileId, displayName, fullName, image, contactLink, preferences, localAlias}
-      chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts, favorite}
-   in case toMaybeConnection connRow of
-        Just activeConn ->
-          let mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito activeConn
-           in Right Contact {contactId, localDisplayName, profile, activeConn, viaGroup, contactUsed, contactStatus, chatSettings, userPreferences, mergedPreferences, createdAt, updatedAt, chatTs, contactGroupMemberId, contactGrpInvSent}
-        _ -> Left $ SEContactNotReady localDisplayName
-
 getProfileById :: DB.Connection -> UserId -> Int64 -> ExceptT StoreError IO LocalProfile
 getProfileById db userId profileId =
   ExceptT . firstRow toProfile (SEProfileNotFound profileId) $
diff --git a/src/Simplex/Chat/Types.hs b/src/Simplex/Chat/Types.hs
index 8f9b03bc8..50b7b27f9 100644
--- a/src/Simplex/Chat/Types.hs
+++ b/src/Simplex/Chat/Types.hs
@@ -160,7 +160,7 @@ data Contact = Contact
   { contactId :: ContactId,
     localDisplayName :: ContactName,
     profile :: LocalProfile,
-    activeConn :: Connection,
+    activeConn :: Maybe Connection,
     viaGroup :: Maybe Int64,
     contactUsed :: Bool,
     contactStatus :: ContactStatus,
@@ -175,32 +175,31 @@ data Contact = Contact
   }
   deriving (Eq, Show)
 
-contactConn :: Contact -> Connection
+contactConn :: Contact -> Maybe Connection
 contactConn Contact {activeConn} = activeConn
 
-contactAgentConnId :: Contact -> AgentConnId
-contactAgentConnId Contact {activeConn = Connection {agentConnId}} = agentConnId
-
-contactConnId :: Contact -> ConnId
-contactConnId = aConnId . contactConn
+contactConnId :: Contact -> Maybe ConnId
+contactConnId c = aConnId <$> contactConn c
 
 type IncognitoEnabled = Bool
 
 contactConnIncognito :: Contact -> IncognitoEnabled
-contactConnIncognito = connIncognito . contactConn
+contactConnIncognito = maybe False connIncognito . contactConn
 
 contactDirect :: Contact -> Bool
-contactDirect Contact {activeConn = Connection {connLevel, viaGroupLink}} = connLevel == 0 && not viaGroupLink
+contactDirect Contact {activeConn} = maybe True direct activeConn
+  where
+    direct Connection {connLevel, viaGroupLink} = connLevel == 0 && not viaGroupLink
 
 directOrUsed :: Contact -> Bool
 directOrUsed ct@Contact {contactUsed} =
   contactDirect ct || contactUsed
 
 anyDirectOrUsed :: Contact -> Bool
-anyDirectOrUsed Contact {contactUsed, activeConn = Connection {connLevel}} = connLevel == 0 || contactUsed
+anyDirectOrUsed Contact {contactUsed, activeConn} = ((\c -> c.connLevel) <$> activeConn) == Just 0 || contactUsed
 
 contactReady :: Contact -> Bool
-contactReady Contact {activeConn} = connReady activeConn
+contactReady Contact {activeConn} = maybe False connReady activeConn
 
 contactActive :: Contact -> Bool
 contactActive Contact {contactStatus} = contactStatus == CSActive
@@ -209,7 +208,7 @@ contactDeleted :: Contact -> Bool
 contactDeleted Contact {contactStatus} = contactStatus == CSDeleted
 
 contactSecurityCode :: Contact -> Maybe SecurityCode
-contactSecurityCode Contact {activeConn} = connectionCode activeConn
+contactSecurityCode Contact {activeConn} = connectionCode =<< activeConn
 
 data ContactStatus
   = CSActive
diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs
index 8779480a5..ea6905ca0 100644
--- a/src/Simplex/Chat/View.hs
+++ b/src/Simplex/Chat/View.hs
@@ -145,9 +145,11 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
   CRGroupsList u gs -> ttyUser u $ viewGroupsList gs
   CRSentGroupInvitation u g c _ ->
     ttyUser u $
-      if viaGroupLink . contactConn $ c
-        then [ttyContact' c <> " invited to group " <> ttyGroup' g <> " via your group link"]
-        else ["invitation to join the group " <> ttyGroup' g <> " sent to " <> ttyContact' c]
+      case contactConn c of
+        Just Connection {viaGroupLink}
+          | viaGroupLink -> [ttyContact' c <> " invited to group " <> ttyGroup' g <> " via your group link"]
+          | otherwise -> ["invitation to join the group " <> ttyGroup' g <> " sent to " <> ttyContact' c]
+        Nothing -> []
   CRFileTransferStatus u ftStatus -> ttyUser u $ viewFileTransferStatus ftStatus
   CRFileTransferStatusXFTP u ci -> ttyUser u $ viewFileTransferStatusXFTP ci
   CRUserProfile u p -> ttyUser u $ viewUserProfile p
@@ -359,7 +361,7 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
     testViewChats chats = [sShow $ map toChatView chats]
       where
         toChatView :: AChat -> (Text, Text, Maybe ConnStatus)
-        toChatView (AChat _ (Chat (DirectChat Contact {localDisplayName, activeConn}) items _)) = ("@" <> localDisplayName, toCIPreview items Nothing, Just $ connStatus activeConn)
+        toChatView (AChat _ (Chat (DirectChat Contact {localDisplayName, activeConn}) items _)) = ("@" <> localDisplayName, toCIPreview items Nothing, connStatus <$> activeConn)
         toChatView (AChat _ (Chat (GroupChat GroupInfo {membership, localDisplayName}) items _)) = ("#" <> localDisplayName, toCIPreview items (Just membership), Nothing)
         toChatView (AChat _ (Chat (ContactRequest UserContactRequest {localDisplayName}) items _)) = ("<@" <> localDisplayName, toCIPreview items Nothing, Nothing)
         toChatView (AChat _ (Chat (ContactConnection PendingContactConnection {pccConnId, pccConnStatus}) items _)) = (":" <> T.pack (show pccConnId), toCIPreview items Nothing, Just pccConnStatus)
@@ -1072,10 +1074,10 @@ viewNetworkConfig NetworkConfig {socksProxy, tcpTimeout} =
     "use " <> highlight' "/network socks=<on/off/[ipv4]:port>[ timeout=<seconds>]" <> " to change settings"
   ]
 
-viewContactInfo :: Contact -> ConnectionStats -> Maybe Profile -> [StyledString]
+viewContactInfo :: Contact -> Maybe ConnectionStats -> Maybe Profile -> [StyledString]
 viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, contactLink}, activeConn} stats incognitoProfile =
   ["contact ID: " <> sShow contactId]
-    <> viewConnectionStats stats
+    <> maybe [] viewConnectionStats stats
     <> maybe [] (\l -> ["contact address: " <> (plain . strEncode) (simplexChatContact l)]) contactLink
     <> maybe
       ["you've shared main profile with this contact"]
@@ -1083,7 +1085,7 @@ viewContactInfo ct@Contact {contactId, profile = LocalProfile {localAlias, conta
       incognitoProfile
     <> ["alias: " <> plain localAlias | localAlias /= ""]
     <> [viewConnectionVerified (contactSecurityCode ct)]
-    <> [viewPeerChatVRange (peerChatVRange activeConn)]
+    <> maybe [] (\ac -> [viewPeerChatVRange (peerChatVRange ac)]) activeConn
 
 viewGroupInfo :: GroupInfo -> GroupSummary -> [StyledString]
 viewGroupInfo GroupInfo {groupId} s =