diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 5e094453..7da3b5e9 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,6 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/reproducible-apk-tools" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/smswithoutborders_libsignal-doubleratchet" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/afkanerd/deku/DefaultSMS/DAO/ThreadedConversationsDao.java b/app/src/main/java/com/afkanerd/deku/DefaultSMS/DAO/ThreadedConversationsDao.java
index 383e8e24..93eae3cc 100644
--- a/app/src/main/java/com/afkanerd/deku/DefaultSMS/DAO/ThreadedConversationsDao.java
+++ b/app/src/main/java/com/afkanerd/deku/DefaultSMS/DAO/ThreadedConversationsDao.java
@@ -72,12 +72,13 @@ public interface ThreadedConversationsDao {
     @Query("SELECT Conversation.address, " +
             "Conversation.text as snippet, " +
             "Conversation.thread_id, " +
-            "Conversation.date, Conversation.type, Conversation.read, " +
+            "Conversation.date, Conversation.type, " +
             "ThreadedConversations.msg_count, ThreadedConversations.is_archived, " +
             "ThreadedConversations.is_blocked, ThreadedConversations.is_read, " +
             "ThreadedConversations.is_shortcode, ThreadedConversations.contact_name, " +
             "ThreadedConversations.is_mute, ThreadedConversations.is_secured, " +
-            "ThreadedConversations.isSelf, ThreadedConversations.subscription_id " +
+            "ThreadedConversations.isSelf, ThreadedConversations.subscription_id, " +
+            "ThreadedConversations.formatted_datetime " +
             "FROM Conversation, ThreadedConversations WHERE " +
             "Conversation.type = :type AND ThreadedConversations.thread_id = Conversation.thread_id " +
             "ORDER BY Conversation.date DESC")
diff --git a/build.gradle b/build.gradle
index d0501758..cea0e271 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.0'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index de50684c..5aeddc61 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,8 @@ org.gradle.jvmargs=-Xmx4G -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+org.gradle.parallel=true
+org.gradle.daemon=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn