diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/privateChats/Chatroom.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/privateChats/Chatroom.kt
index 40360848e..31b3ff3db 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/privateChats/Chatroom.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/privateChats/Chatroom.kt
@@ -38,7 +38,7 @@ class Chatroom : NotesGatherer {
     var subject = MutableStateFlow<String?>(null)
     var subjectCreatedAt: Long? = null
     var ownerSentMessage: Boolean = false
-    var lastMessage: Note? = null
+    var newestMessage: Note? = null
 
     override fun removeNote(note: Note) {
         removeMessageSync(note)
@@ -57,8 +57,8 @@ class Chatroom : NotesGatherer {
             }
 
             val createdAt = msg.createdAt() ?: 0
-            if (createdAt > (lastMessage?.createdAt() ?: 0)) {
-                lastMessage = msg
+            if (createdAt > (newestMessage?.createdAt() ?: 0)) {
+                newestMessage = msg
             }
 
             val newSubject = msg.event?.subject()
@@ -78,8 +78,8 @@ class Chatroom : NotesGatherer {
             messages = messages - msg
             msg.removeGatherer(this)
 
-            if (msg == lastMessage) {
-                lastMessage = messages.maxByOrNull { it.createdAt() ?: 0 }
+            if (msg == newestMessage) {
+                newestMessage = messages.maxByOrNull { it.createdAt() ?: 0 }
             }
 
             if (msg.event?.subject() == subject.value) {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListKnownFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListKnownFeedFilter.kt
index debe99060..09bc8a4b3 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListKnownFeedFilter.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListKnownFeedFilter.kt
@@ -47,7 +47,7 @@ class ChatroomListKnownFeedFilter(
                 if ((chatroom.senderIntersects(followingKeySet) || chatList.hasSentMessagesTo(key)) &&
                     !account.isAllHidden(key.users)
                 ) {
-                    chatroom.lastMessage
+                    chatroom.newestMessage
                 } else {
                     null
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListNewFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListNewFeedFilter.kt
index 920c4bb1c..ffc24da83 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListNewFeedFilter.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListNewFeedFilter.kt
@@ -41,7 +41,7 @@ class ChatroomListNewFeedFilter(
         val privateMessages =
             chatList.rooms.mapNotNull { key, chatroom ->
                 if (!chatroom.senderIntersects(followingKeySet) && !chatList.hasSentMessagesTo(key) && !account.isAllHidden(key.users)) {
-                    chatroom.lastMessage
+                    chatroom.newestMessage
                 } else {
                     null
                 }