diff --git a/app/build.gradle b/app/build.gradle
index aa3ad4e779..2e52adddd5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,8 +31,8 @@ configurations.all {
     exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 373
-def canonicalVersionName = "1.18.4"
+def canonicalVersionCode = 374
+def canonicalVersionName = "1.18.5"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
index 3edfcffc97..3a4bfd6816 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
@@ -18,6 +18,7 @@ import org.session.libsession.messaging.utilities.SodiumUtilities
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.ThemeUtil
 import org.session.libsession.utilities.getColorFromAttr
+import org.session.libsession.utilities.truncateIdForDisplay
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.util.RoundedBackgroundSpan
 import org.thoughtcrime.securesms.util.getAccentColor
@@ -67,7 +68,7 @@ object MentionUtilities {
                 } else {
                     val contact = DatabaseComponent.get(context).sessionContactDatabase().getContactWithSessionID(publicKey)
                     @Suppress("NAME_SHADOWING") val context = if (openGroup != null) Contact.ContactContext.OPEN_GROUP else Contact.ContactContext.REGULAR
-                    contact?.displayName(context)
+                    contact?.displayName(context) ?: truncateIdForDisplay(publicKey)
                 }
                 if (userDisplayName != null) {
                     val mention = "@$userDisplayName"
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RoundedBackgroundSpan.kt b/app/src/main/java/org/thoughtcrime/securesms/util/RoundedBackgroundSpan.kt
index ebefc9c50c..a4cf1b1e96 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/RoundedBackgroundSpan.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RoundedBackgroundSpan.kt
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.util
 
 import android.content.Context
-import android.content.res.Resources
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.RectF
@@ -50,6 +49,17 @@ class RoundedBackgroundSpan(
     override fun getSize(
         paint: Paint, text: CharSequence?, start: Int, end: Int, fm: Paint.FontMetricsInt?
     ): Int {
+        // If the span covers the whole text, and the height is not set, draw() will not be called for the span.
+        // To help with that we need to take the font metric into account
+        val metrics = paint.fontMetricsInt
+        if (fm != null) {
+            fm.top = metrics.top
+            fm.ascent = metrics.ascent
+            fm.descent = metrics.descent
+
+            fm.bottom = metrics.bottom
+        }
+
         return (paint.measureText(text, start, end) + 2 * paddingHorizontal).toInt()
     }
 
diff --git a/app/src/main/res/xml/network_security_configuration.xml b/app/src/main/res/xml/network_security_configuration.xml
index f3a7419b55..7469ebe106 100644
--- a/app/src/main/res/xml/network_security_configuration.xml
+++ b/app/src/main/res/xml/network_security_configuration.xml
@@ -2,6 +2,7 @@
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">127.0.0.1</domain>
+        <domain includeSubdomains="true">public.loki.foundation</domain>
     </domain-config>
     <domain-config cleartextTrafficPermitted="false">
         <domain includeSubdomains="false">seed1.getsession.org</domain>
diff --git a/libsession/src/main/java/org/session/libsession/utilities/IdUtil.kt b/libsession/src/main/java/org/session/libsession/utilities/IdUtil.kt
index ccaa31c2f9..1902b6e0ab 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/IdUtil.kt
+++ b/libsession/src/main/java/org/session/libsession/utilities/IdUtil.kt
@@ -1,4 +1,4 @@
 package org.session.libsession.utilities
 
 fun truncateIdForDisplay(id: String): String =
-    id.takeIf { it.length > 8 }?.apply{ "${take(4)}…${takeLast(4)}" } ?: id
+    id.takeIf { it.length > 8 }?.run{ "${take(4)}…${takeLast(4)}" } ?: id