diff --git a/src/status/chat.nim b/src/status/chat.nim
index 987bed4116..ee4df4e481 100644
--- a/src/status/chat.nim
+++ b/src/status/chat.nim
@@ -133,7 +133,8 @@ proc join*(self: ChatModel, chatId: string, chatType: ChatType, ensName: string
 
   var chat = newChat(chatId, ChatType(chatType))
   self.channels[chat.id] = chat
-  status_chat.saveChat(chatId, chatType, color=chat.color, ensName=ensName, profile=pubKey)
+  let joined = times.toUnix(times.getTime()) * 1000
+  status_chat.saveChat(chatId, chatType, color=chat.color, ensName=ensName, profile=pubKey, joined=joined)
   if ensName != "":
     chat.name = ensName
     chat.ensName = ensName
diff --git a/src/status/chat/chat.nim b/src/status/chat/chat.nim
index 6fca4a2c19..eec4dc5a70 100644
--- a/src/status/chat/chat.nim
+++ b/src/status/chat/chat.nim
@@ -67,6 +67,7 @@ type Chat* = ref object
   isActive*: bool # indicates whether the chat has been soft deleted
   chatType*: ChatType
   timestamp*: int64 # indicates the last time this chat has received/sent a message
+  joined*: int64 # indicates when the user joined the chat last time
   lastClockValue*: int64 # indicates the last clock value to be used when sending messages
   deletedAtClockValue*: int64 # indicates the clock value at time of deletion, messages with lower clock value of this should be discarded
   unviewedMessagesCount*: int
@@ -132,7 +133,8 @@ proc toJsonNode*(self: Chat): JsonNode =
     "membershipUpdateEvents": self.membershipUpdateEvents.toJsonNode,
     "name": (if self.ensName != "": self.ensName else: self.name),
     "timestamp": self.timestamp,
-    "unviewedMessagesCount": self.unviewedMessagesCount
+    "unviewedMessagesCount": self.unviewedMessagesCount,
+    "joined": self.joined
   }
 
 proc findIndexById*(self: seq[Chat], id: string): int =
diff --git a/src/status/libstatus/chat.nim b/src/status/libstatus/chat.nim
index 2f75266f85..4686710ad9 100644
--- a/src/status/libstatus/chat.nim
+++ b/src/status/libstatus/chat.nim
@@ -18,7 +18,7 @@ proc removeFilters*(chatId: string, filterId: string) =
     [{ "ChatID": chatId, "FilterID": filterId }]
   ])
 
-proc saveChat*(chatId: string, chatType: ChatType, active: bool = true, color: string = "#000000", ensName: string = "", profile: string = "") =
+proc saveChat*(chatId: string, chatType: ChatType, active: bool = true, color: string = "#000000", ensName: string = "", profile: string = "", joined: int64 = 0) =
   # TODO: ideally status-go/stimbus should handle some of these fields instead of having the client
   # send them: lastMessage, unviewedMEssagesCount, timestamp, lastClockValue, name?
   discard callPrivateRPC("saveChat".prefix, %* [
@@ -32,7 +32,8 @@ proc saveChat*(chatId: string, chatType: ChatType, active: bool = true, color: s
       "id": chatId,
       "unviewedMessagesCount": 0, # TODO:
       "chatType":  chatType.int,
-      "timestamp": 1588940692659  # TODO:
+      "timestamp": 1588940692659,  # TODO:
+      "joined": joined
     }
   ])
 
@@ -40,9 +41,17 @@ proc deactivateChat*(chat: Chat) =
   chat.isActive = false
   discard callPrivateRPC("saveChat".prefix, %* [chat.toJsonNode])
 
-proc sortChats(x, y: Chat): int = 
-  if x.lastMessage.whisperTimestamp > y.lastMessage.whisperTimestamp: 1
-  elif x.lastMessage.whisperTimestamp == y.lastMessage.whisperTimestamp: 0
+proc sortChats(x, y: Chat): int =
+  var t1 = x.lastMessage.whisperTimestamp
+  var t2 = y.lastMessage.whisperTimestamp
+
+  if t1 <= $x.joined:
+    t1 = $x.joined
+  if t2 <= $y.joined:
+    t2 = $y.joined
+
+  if t1 > t2: 1
+  elif t1 == t2: 0
   else: -1
 
 proc loadChats*(): seq[Chat] =
diff --git a/src/status/signals/messages.nim b/src/status/signals/messages.nim
index f9a08e3de0..033a228a9b 100644
--- a/src/status/signals/messages.nim
+++ b/src/status/signals/messages.nim
@@ -141,7 +141,8 @@ proc toChat*(jsonChat: JsonNode): Chat =
     unviewedMessagesCount: jsonChat{"unviewedMessagesCount"}.getInt,
     hasMentions: false,
     muted: false,
-    ensName: ""
+    ensName: "",
+    joined: 0
   )
 
   if jsonChat.hasKey("muted") and jsonChat["muted"].kind != JNull: 
@@ -149,6 +150,9 @@ proc toChat*(jsonChat: JsonNode): Chat =
 
   if jsonChat["lastMessage"].kind != JNull: 
     result.lastMessage = jsonChat{"lastMessage"}.toMessage(pk)
+
+  if jsonChat.hasKey("joined") and jsonChat["joined"].kind != JNull:
+    result.joined = jsonChat{"joined"}.getInt
   
   if result.chatType == ChatType.OneToOne:
     result.identicon = generateIdenticon(result.id)
diff --git a/vendor/status-go b/vendor/status-go
index 6037570901..dd49e604d4 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit 6037570901233477cbef85d5494b257076a3acd9
+Subproject commit dd49e604d49a2906dfad6ac1e459b72de014e2c0