diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index ba30937004..99b0bd1901 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1018,7 +1018,6 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             } else {
                 binding.placeholderText.setText(textResource)
             }
-
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
index c6a6e1f7f5..4b087fe283 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -6,7 +6,6 @@ import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
 import android.util.AttributeSet
 import android.util.TypedValue
-import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
@@ -128,7 +127,7 @@ class ConversationView : LinearLayout {
         return if (recipient.isLocalNumber) {
             context.getString(R.string.note_to_self)
         } else {
-            recipient.name // Internally uses the Contact API
+            recipient.toShortString() // Internally uses the Contact API
         }
     }
     // endregion
diff --git a/app/src/main/res/xml/preferences_app_protection.xml b/app/src/main/res/xml/preferences_app_protection.xml
index 0a7a15f70e..e483e8480b 100644
--- a/app/src/main/res/xml/preferences_app_protection.xml
+++ b/app/src/main/res/xml/preferences_app_protection.xml
@@ -12,7 +12,6 @@
             android:title="@string/preferences_app_protection__screen_lock"
             android:summary="@string/preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint" />
 
-        <!-- TODO: check figure out what is needed for this -->
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_screen_security"
diff --git a/libsession-util/src/androidTest/java/network/loki/messenger/libsession_util/InstrumentedTests.kt b/libsession-util/src/androidTest/java/network/loki/messenger/libsession_util/InstrumentedTests.kt
index 42d147ec38..8b0777a6a4 100644
--- a/libsession-util/src/androidTest/java/network/loki/messenger/libsession_util/InstrumentedTests.kt
+++ b/libsession-util/src/androidTest/java/network/loki/messenger/libsession_util/InstrumentedTests.kt
@@ -122,7 +122,8 @@ class InstrumentedTests {
             nickname = "Nickname 3",
             approved = true,
             blocked = true,
-            profilePicture = UserPic("http://example.com/huge.bmp", "qwertyuio01234567890123456789012".encodeToByteArray())
+            profilePicture = UserPic("http://example.com/huge.bmp", "qwertyuio01234567890123456789012".encodeToByteArray()),
+            expiryMode = ExpiryMode.NONE
         )
         contacts2.set(third)
         assertTrue(contacts.needsPush())
@@ -261,7 +262,6 @@ class InstrumentedTests {
         userProfile.confirmPushed(conf.seqNo, "fakehash2")
         newConf.confirmPushed(conf2.seqNo, "fakehash3")
 
-        userProfile.dump()
         userProfile.dump()
 
         assertFalse(conf.config.contentEquals(conf2.config))
@@ -285,18 +285,18 @@ class InstrumentedTests {
 
         newConf.confirmPushed(newSeqMerge.seqNo, "fakehash5")
 
-        assertEquals("Nibbler", newConf.getName())
-        assertEquals(4, newSeqMerge.seqNo)
+        assertEquals("Raz", newConf.getName())
+        assertEquals(3, newSeqMerge.seqNo)
 
         // userProfile device polls and merges
         userProfile.merge("fakehash5" to newSeqMerge.config)
 
         val userConfigMerge = userProfile.push()
 
-        assertEquals(4, userConfigMerge.seqNo)
+        assertEquals(3, userConfigMerge.seqNo)
 
-        assertEquals("Nibbler", newConf.getName())
-        assertEquals("Nibbler", userProfile.getName())
+        assertEquals("Raz", newConf.getName())
+        assertEquals("Raz", userProfile.getName())
 
         userProfile.free()
         newConf.free()
diff --git a/libsession-util/src/main/cpp/CMakeLists.txt b/libsession-util/src/main/cpp/CMakeLists.txt
index 84e8eb9f52..e3b6f2912c 100644
--- a/libsession-util/src/main/cpp/CMakeLists.txt
+++ b/libsession-util/src/main/cpp/CMakeLists.txt
@@ -14,7 +14,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(CMAKE_BUILD_TYPE Debug)
+set(CMAKE_BUILD_TYPE Release)
 
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.
diff --git a/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java b/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java
index a7fa75dd2b..1e875fd2a1 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java
+++ b/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java
@@ -325,7 +325,7 @@ public class Recipient implements RecipientModifiedListener {
       return contact.displayName(Contact.ContactContext.REGULAR);
     } else {
       Contact contact = storage.getContactWithSessionID(sessionID);
-      if (contact == null) { return sessionID; }
+      if (contact == null) { return null; }
       return contact.displayName(Contact.ContactContext.REGULAR);
     }
   }
@@ -483,7 +483,13 @@ public class Recipient implements RecipientModifiedListener {
 
   public synchronized String toShortString() {
     String name = getName();
-    return (name != null ? name : address.serialize());
+    if (name != null) return name;
+    String sessionId = address.serialize();
+    if (sessionId.length() < 4) return sessionId; // so substrings don't throw out of bounds exceptions
+    int takeAmount = 4;
+    String start = sessionId.substring(0, takeAmount);
+    String end = sessionId.substring(sessionId.length()-takeAmount);
+    return start+"..."+end;
   }
 
   public synchronized @NonNull Drawable getFallbackContactPhotoDrawable(Context context, boolean inverted) {