diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
index 3fcce8fbc6..29f3a1bea0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
@@ -739,7 +739,7 @@ class MmsDatabase(context: Context, databaseHelper: SQLCipherOpenHelper) : Messa
             )
         }
         with (get(context).threadDatabase()) {
-            setLastSeen(threadId)
+            setLastSeen(threadId, message.sentTimeMillis)
             setHasSent(threadId, true)
             if (runThreadUpdate) {
                 update(threadId, true, true)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
index 7b020ee73a..3cdade90e2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -564,7 +564,7 @@ public class SmsDatabase extends MessagingDatabase {
     if (runThreadUpdate) {
       DatabaseComponent.get(context).threadDatabase().update(threadId, true, true);
     }
-    DatabaseComponent.get(context).threadDatabase().setLastSeen(threadId);
+    DatabaseComponent.get(context).threadDatabase().setLastSeen(threadId, message.getSentTimestampMillis());
 
     DatabaseComponent.get(context).threadDatabase().setHasSent(threadId, true);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 87d3445b31..18a703dcd4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -514,9 +514,7 @@ open class Storage(context: Context, helper: SQLCipherOpenHelper, private val co
 
         toDeleteClosedGroups.forEach { deleteGroup ->
             val threadId = getThreadId(deleteGroup.encodedId)
-            if (threadId == null) {
-                Log.w("Loki-DBG", "Existing group had no thread to delete")
-            } else {
+            if (threadId != null) {
                 Log.d("Loki-DBG", "Deleting group for thread $threadId")
                 ClosedGroupManager.silentlyRemoveGroup(context,threadId,GroupUtil.doubleDecodeGroupId(deleteGroup.encodedId), deleteGroup.encodedId, localUserPublicKey, delete = true)
             }
diff --git a/libsession-util/libsession-util b/libsession-util/libsession-util
index 2c18eced69..97084c69f8 160000
--- a/libsession-util/libsession-util
+++ b/libsession-util/libsession-util
@@ -1 +1 @@
-Subproject commit 2c18eced69f464ed96aa5bb6ec7c4c6f815e17fe
+Subproject commit 97084c69f86e67c675095b48efacc86113ccebb0
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
index 13a1c0e615..ecb8dd8429 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
@@ -154,7 +154,6 @@ class Poller(private val configFactory: ConfigFactoryProtocol, debounceTimer: Ti
                     Log.w("Loki-DBG", "shared config message handled in configs wasn't SharedConfigurationMessage but was ${message.javaClass.simpleName}")
                     return@forEach
                 }
-                Log.d("Loki-DBG", "Merging config of kind ${message.kind} into ${forConfigObject.javaClass.simpleName}")
                 forConfigObject.merge(hash!! to message.data)
             } catch (e: Exception) {
                 Log.e("Loki", e)