diff --git a/apps/ios/Shared/Views/Chat/ChatItem/CILinkView.swift b/apps/ios/Shared/Views/Chat/ChatItem/CILinkView.swift
index 4eb187bcac..3433115ceb 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/CILinkView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/CILinkView.swift
@@ -52,7 +52,7 @@ struct CILinkView: View {
 func openBrowserAlert(uri: String) {
     let (url, err) = sanitizeUri(uri)
     if let url {
-        let uriStr = url.uri.absoluteString
+        let uriStr = displayedUri(url.uri.absoluteString)
         showAlert(
             NSLocalizedString("Open link?", comment: "alert title"),
             message: uriStr.count > 160 ? "\(uriStr.prefix(160))…" : uriStr,
@@ -90,9 +90,9 @@ func openBrowserAlert(uri: String) {
 
 func showInvalidLinkAlert(_ uri: String, error: String? = nil) {
     let message = if let error, !error.isEmpty {
-        error + "\n" + uri
+        error + "\n" + displayedUri(uri)
     } else {
-        uri
+        displayedUri(uri)
     }
     showAlert(
         NSLocalizedString("Invalid link", comment: "alert title"),
@@ -101,6 +101,26 @@ func showInvalidLinkAlert(_ uri: String, error: String? = nil) {
     )
 }
 
+func unicodeMarker(_ s: Unicode.Scalar) -> String {
+    String(format: "[U+%04X]", s.value)
+}
+
+func displayedUri(_ uri: String) -> String {
+    let authority = uri.range(of: "://").map { scheme in
+        scheme.upperBound ..< (uri[scheme.upperBound...].firstIndex(where: { "/?#".contains($0) }) ?? uri.endIndex)
+    }
+    var shown = ""
+    for i in uri.unicodeScalars.indices {
+        let s = uri.unicodeScalars[i]
+        if s.properties.generalCategory == .format || (!s.isASCII && authority?.contains(i) == true) {
+            shown += unicodeMarker(s)
+        } else {
+            shown.unicodeScalars.append(s)
+        }
+    }
+    return shown
+}
+
 func sanitizeUri(_ s: String) -> (url: (uri: URL, sanitizedUri: URL?)?, error: String?) {
     let parsed = parseSanitizeUri(s, safe: false)
     return if let uri = URL(string: s), let uriInfo = parsed?.uriInfo {
diff --git a/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift b/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift
index c9d8858fa1..f95e31369e 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift
@@ -490,6 +490,7 @@ func messageText(
                     attrs[webLinkAttrKey] = true
                     handleTaps = true
                 }
+                t = displayedUri(t)
             case let .hyperLink(text, uri):
                 attrs = linkAttrs()
                 if let text { t = text }
diff --git a/apps/ios/Shared/Views/Helpers/ShareSheet.swift b/apps/ios/Shared/Views/Helpers/ShareSheet.swift
index 56e437e5c8..ebe74b2a50 100644
--- a/apps/ios/Shared/Views/Helpers/ShareSheet.swift
+++ b/apps/ios/Shared/Views/Helpers/ShareSheet.swift
@@ -98,7 +98,7 @@ func openExternalLink(_ url: URL) {
     } else {
         showAlert(
             title: NSLocalizedString("Open external link?", comment: "alert title"),
-            message: s,
+            message: displayedUri(s),
             buttonTitle: NSLocalizedString("Open", comment: "alert button"),
             buttonAction: { UIApplication.shared.open(url) },
             cancelButton: true
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
index da64862c03..c198451464 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
@@ -96,6 +96,7 @@ fun itemSegmentDisplayText(ft: FormattedText, ci: ChatItem, linkMode: SimplexLin
       } else if (mention != null) mentionText(ft.format.memberName)
       else ft.text
     }
+    is Format.Uri -> displayedUri(ft.text)
     is Format.HyperLink -> ft.format.showText ?: ft.text
     is Format.SimplexLink -> {
       val t = ft.format.showText
@@ -283,7 +284,7 @@ fun MarkdownText (
               val s = ft.text
               val link = if (s.startsWith("http://") || s.startsWith("https://")) s else "https://$s"
               withAnnotation(tag = "WEB_URL", annotation = link) {
-                withStyle(ftStyle) { append(ft.text) }
+                withStyle(ftStyle) { append(displayedUri(ft.text)) }
               }
             }
             is Format.HyperLink -> {
@@ -535,19 +536,22 @@ fun openBrowserAlert(uri: String, uriHandler: UriHandler) {
   if (res == null) {
     showInvalidLinkAlert(uri, err)
   } else {
-    val message = if (uri.count() > 160) uri.substring(0, 159) + "…" else uri
+    val shownUri = displayedUri(uri)
+    val message = if (shownUri.count() > 160) shownUri.substring(0, 159) + "…" else shownUri
     val sanitizedUri = res.second
     if (sanitizedUri == null) {
       AlertManager.shared.showAlertDialog(
         generalGetString(MR.strings.privacy_chat_list_open_web_link_question),
         message,
         confirmText = generalGetString(MR.strings.open_verb),
-        onConfirm = { safeOpenUri(uri, uriHandler) }
+        onConfirm = { safeOpenUri(uri, uriHandler) },
+        parseHtml = false
       )
     } else {
       AlertManager.shared.showAlertDialogButtonsColumn(
         generalGetString(MR.strings.privacy_chat_list_open_web_link_question),
         message,
+        parseHtml = false,
         buttons = {
         Column {
           SectionItemView({
@@ -585,7 +589,7 @@ fun safeOpenUri(uri: String, uriHandler: UriHandler) {
 }
 
 fun showInvalidLinkAlert(uri: String, error: String? = null) {
-  val message = if (error.isNullOrEmpty()) { uri } else { error + "\n" + uri }
+  val message = if (error.isNullOrEmpty()) { displayedUri(uri) } else { error + "\n" + displayedUri(uri) }
   AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_parsing_uri_title), message)
 }
 
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 dfe33e3595..6b69a3820f 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
@@ -617,13 +617,27 @@ fun UriHandler.openExternalLink(uri: String) {
   } else {
     AlertManager.shared.showAlertDialog(
       title = generalGetString(MR.strings.open_external_link_title),
-      text = uri,
+      text = displayedUri(uri),
       confirmText = generalGetString(MR.strings.open_verb),
-      onConfirm = { uriHandler.openUriCatching(uri) }
+      onConfirm = { uriHandler.openUriCatching(uri) },
+      parseHtml = false
     )
   }
 }
 
+val invisibleChar = Regex("\\p{Cf}")
+
+private val nonAsciiChar = Regex("[^\\x00-\\x7F]")
+
+fun unicodeMarker(c: String): String = "[U+" + Integer.toHexString(c.codePointAt(0)).uppercase().padStart(4, '0') + "]"
+
+fun displayedUri(uri: String): String {
+  val authorityStart = uri.indexOf("://").takeIf { it >= 0 }?.plus(3) ?: uri.length
+  val authorityEnd = uri.indexOfAny(charArrayOf('/', '?', '#'), authorityStart).takeIf { it >= 0 } ?: uri.length
+  val authority = uri.substring(authorityStart, authorityEnd).replace(nonAsciiChar) { unicodeMarker(it.value) }
+  return uri.replaceRange(authorityStart, authorityEnd, authority).replace(invisibleChar) { unicodeMarker(it.value) }
+}
+
 fun IntSize.Companion.Saver(): Saver<IntSize, *> = Saver(
   save = { it.width to it.height },
   restore = { IntSize(it.first, it.second) }