diff --git a/app/src/main/java/com/safaorhan/reunion/FirestoreHelper.java b/app/src/main/java/com/safaorhan/reunion/FirestoreHelper.java
index c2f6134..ad5b904 100644
--- a/app/src/main/java/com/safaorhan/reunion/FirestoreHelper.java
+++ b/app/src/main/java/com/safaorhan/reunion/FirestoreHelper.java
@@ -6,6 +6,7 @@
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.Timestamp;
 import com.google.firebase.firestore.CollectionReference;
 import com.google.firebase.firestore.DocumentReference;
 import com.google.firebase.firestore.DocumentSnapshot;
@@ -102,7 +103,7 @@ public static void sendMessage(final String messageText, final DocumentReference
                     @Override
                     public void onSuccess(DocumentReference documentReference) {
                         conversationRef
-                                .update("lastMessage", documentReference)
+                                .update("lastMessage", documentReference, "conversationTime", Timestamp.now())
                                 .addOnSuccessListener(new OnSuccessListener<Void>() {
                                     @Override
                                     public void onSuccess(Void aVoid) {
diff --git a/app/src/main/java/com/safaorhan/reunion/adapter/ConversationAdapter.java b/app/src/main/java/com/safaorhan/reunion/adapter/ConversationAdapter.java
index 7767808..4abae80 100644
--- a/app/src/main/java/com/safaorhan/reunion/adapter/ConversationAdapter.java
+++ b/app/src/main/java/com/safaorhan/reunion/adapter/ConversationAdapter.java
@@ -53,7 +53,7 @@ public void setConversationClickListener(ConversationClickListener conversationC
     public static ConversationAdapter get() {
         Query query = FirebaseFirestore.getInstance()
                 .collection("conversations")
-                //.orderBy("timestamp")
+                .orderBy("conversationTime", Query.Direction.DESCENDING)
                 .whereEqualTo(FirestoreHelper.getMe().getId(), true)
                 .limit(50);
 
diff --git a/app/src/main/java/com/safaorhan/reunion/model/Conversation.java b/app/src/main/java/com/safaorhan/reunion/model/Conversation.java
index 98eb2fe..96f1e04 100644
--- a/app/src/main/java/com/safaorhan/reunion/model/Conversation.java
+++ b/app/src/main/java/com/safaorhan/reunion/model/Conversation.java
@@ -1,5 +1,6 @@
 package com.safaorhan.reunion.model;
 
+import com.google.firebase.Timestamp;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.firestore.DocumentReference;
 
@@ -9,6 +10,8 @@ public class Conversation {
     String id;
     DocumentReference lastMessage;
     List<DocumentReference> participants;
+    @ServerTimestamp
+    Timestamp conversationTime;
 
     public String getId() {
         return id;