diff --git a/app/sql.js b/app/sql.js
index 5b95a6c64..9781cba61 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -810,6 +810,7 @@ const LOKI_SCHEMA_VERSIONS = [
   updateToLokiSchemaVersion5,
   updateToLokiSchemaVersion6,
   updateToLokiSchemaVersion7,
+  updateToLokiSchemaVersion8,
 ];
 
 async function updateToLokiSchemaVersion1(currentVersion, instance) {
@@ -823,7 +824,6 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
     `ALTER TABLE messages
      ADD COLUMN serverId INTEGER;`
   );
-
   await instance.run(
     `CREATE TABLE servers(
       serverUrl STRING PRIMARY KEY ASC,
@@ -1051,6 +1051,29 @@ async function updateToLokiSchemaVersion7(currentVersion, instance) {
   console.log('updateToLokiSchemaVersion7: success!');
 }
 
+async function updateToLokiSchemaVersion8(currentVersion, instance) {
+  if (currentVersion >= 8) {
+    return;
+  }
+  console.log('updateToLokiSchemaVersion8: starting...');
+  await instance.run('BEGIN TRANSACTION;');
+
+  await instance.run(
+    `ALTER TABLE messages
+     ADD COLUMN serverTimestamp INTEGER;`
+  );
+
+  await instance.run(
+    `INSERT INTO loki_schema (
+        version
+      ) values (
+        8
+      );`
+  );
+  await instance.run('COMMIT TRANSACTION;');
+  console.log('updateToLokiSchemaVersion8: success!');
+}
+
 async function updateLokiSchema(instance) {
   const result = await instance.get(
     "SELECT name FROM sqlite_master WHERE type = 'table' AND name='loki_schema';"
@@ -2092,6 +2115,7 @@ async function saveMessage(data, { forceSave } = {}) {
     hasVisualMediaAttachments,
     id,
     serverId,
+    serverTimestamp,
     // eslint-disable-next-line camelcase
     received_at,
     schemaVersion,
@@ -2111,6 +2135,7 @@ async function saveMessage(data, { forceSave } = {}) {
     $json: objectToJSON(data),
 
     $serverId: serverId,
+    $serverTimestamp: serverTimestamp,
     $body: body,
     $conversationId: conversationId,
     $expirationStartTimestamp: expirationStartTimestamp,
@@ -2134,6 +2159,7 @@ async function saveMessage(data, { forceSave } = {}) {
       `UPDATE messages SET
         json = $json,
         serverId = $serverId,
+        serverTimestamp = $serverTimestamp,
         body = $body,
         conversationId = $conversationId,
         expirationStartTimestamp = $expirationStartTimestamp,
@@ -2169,6 +2195,7 @@ async function saveMessage(data, { forceSave } = {}) {
     json,
 
     serverId,
+    serverTimestamp,
     body,
     conversationId,
     expirationStartTimestamp,
@@ -2190,6 +2217,7 @@ async function saveMessage(data, { forceSave } = {}) {
     $json,
 
     $serverId,
+    $serverTimestamp,
     $body,
     $conversationId,
     $expirationStartTimestamp,
@@ -2419,7 +2447,7 @@ async function getMessagesByConversation(
       conversationId = $conversationId AND
       received_at < $received_at AND
       type LIKE $type
-    ORDER BY sent_at DESC
+      ORDER BY serverTimestamp DESC, serverId DESC, sent_at DESC
     LIMIT $limit;
     `,
     {
diff --git a/js/models/messages.js b/js/models/messages.js
index bd69ec79e..4e826b410 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -596,6 +596,7 @@
         id: this.id,
         direction: this.isIncoming() ? 'incoming' : 'outgoing',
         timestamp: this.get('sent_at'),
+        serverTimestamp: this.get('serverTimestamp'),
         status: this.getMessagePropStatus(),
         contact: this.getPropsForEmbeddedContact(),
         authorColor,
@@ -1669,13 +1670,6 @@
 
   Whisper.MessageCollection = Backbone.Collection.extend({
     model: Whisper.Message,
-    comparator(left, right) {
-      if (left.get('sent_at') === right.get('sent_at')) {
-        return (left.get('received_at') || 0) - (right.get('received_at') || 0);
-      }
-
-      return (left.get('sent_at') || 0) - (right.get('sent_at') || 0);
-    },
     initialize(models, options) {
       if (options) {
         this.conversation = options.conversation;
@@ -1726,7 +1720,7 @@
         );
       }
 
-      this.add(models);
+      this.add(models.reverse());
 
       if (unreadCount <= 0) {
         return;
diff --git a/js/modules/data.d.ts b/js/modules/data.d.ts
index f967fd287..0b344b121 100644
--- a/js/modules/data.d.ts
+++ b/js/modules/data.d.ts
@@ -324,6 +324,7 @@ export function getMessagesByConversation(
     type?: string;
   }
 ): Promise<any>;
+
 export function getSeenMessagesByHashList(hashes: any): Promise<any>;
 export function getLastHashBySnode(convoId: any, snode: any): Promise<any>;
 
diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js
index 369de615a..b2a7a6b6e 100644
--- a/js/modules/loki_app_dot_net_api.js
+++ b/js/modules/loki_app_dot_net_api.js
@@ -1799,7 +1799,9 @@ class LokiPublicChannelAPI {
     }
 
     return {
-      timestamp: new Date(`${adnMessage.created_at}`).getTime() || timestamp,
+      timestamp,
+      serverTimestamp:
+        new Date(`${adnMessage.created_at}`).getTime() || timestamp,
       attachments,
       preview,
       quote,
@@ -1919,6 +1921,7 @@ class LokiPublicChannelAPI {
         adnMessage.body = messengerData.text;
         const {
           timestamp,
+          serverTimestamp,
           quote,
           attachments,
           preview,
@@ -1990,9 +1993,9 @@ class LokiPublicChannelAPI {
           isSessionRequest: false,
           source: pubKey,
           sourceDevice: 1,
-          timestamp,
+          timestamp, // sender timestamp
 
-          serverTimestamp: timestamp,
+          serverTimestamp, // server created_at, used to order messages
           receivedAt,
           isPublic: true,
           message: {
@@ -2008,7 +2011,7 @@ class LokiPublicChannelAPI {
             profileKey,
             timestamp,
             received_at: receivedAt,
-            sent_at: timestamp,
+            sent_at: timestamp, // sender timestamp inner
             quote,
             contact: [],
             preview,
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index a1bcd66ad..6d1974ff2 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -65,6 +65,7 @@ export interface Props {
   collapseMetadata?: boolean;
   direction: 'incoming' | 'outgoing';
   timestamp: number;
+  serverTimestamp?: number;
   status?: 'sending' | 'sent' | 'delivered' | 'read' | 'error';
   // What if changed this over to a single contact like quote, and put the events on it?
   contact?: Contact & {
@@ -257,6 +258,7 @@ export class Message extends React.PureComponent<Props, State> {
       text,
       textPending,
       timestamp,
+      serverTimestamp,
     } = this.props;
 
     if (collapseMetadata) {
@@ -299,7 +301,7 @@ export class Message extends React.PureComponent<Props, State> {
         ) : (
           <Timestamp
             i18n={i18n}
-            timestamp={timestamp}
+            timestamp={serverTimestamp || timestamp}
             extended={true}
             direction={direction}
             withImageNoCaption={withImageNoCaption}
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 971d4ccc3..335f269f1 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -446,6 +446,7 @@ interface MessageCreationData {
   source: boolean;
   serverId: string;
   message: any;
+  serverTimestamp: any;
 
   // Needed for synced outgoing messages
   unidentifiedStatus: any; // ???
@@ -464,6 +465,7 @@ export function initIncomingMessage(data: MessageCreationData): MessageModel {
     source,
     serverId,
     message,
+    serverTimestamp,
   } = data;
 
   const type = 'incoming';
@@ -476,6 +478,7 @@ export function initIncomingMessage(data: MessageCreationData): MessageModel {
     sourceDevice,
     serverId, // + (not present below in `createSentMessage`)
     sent_at: timestamp,
+    serverTimestamp,
     received_at: receivedAt || Date.now(),
     conversationId: groupId ?? source,
     unidentifiedDeliveryReceived, // +