diff --git a/js/models/messages.js b/js/models/messages.js
index 8796fabf342..9bc81f586b3 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -202,7 +202,7 @@
 
         id: this.id,
         conversationId: this.get('conversationId'),
-        receivedAt: this.get('received_at'),
+        sentAt: this.get('sent_at'),
         snippet: this.get('snippet'),
       };
     },
diff --git a/ts/components/MessageSearchResult.md b/ts/components/MessageSearchResult.md
index 435f0344815..1ad50030e75 100644
--- a/ts/components/MessageSearchResult.md
+++ b/ts/components/MessageSearchResult.md
@@ -14,7 +14,7 @@
     snippet="What's <<left>>going<<right>> on?"
     id="messageId1"
     conversationId="conversationId1"
-    receivedAt={Date.now() - 24 * 60 * 1000}
+    sentAt={Date.now() - 24 * 60 * 1000}
     onClick={result => console.log('onClick', result)}
     i18n={util.i18n}
   />
@@ -38,7 +38,7 @@
     snippet="What's <<left>>going<<right>> on?"
     id="messageId1"
     conversationId="conversationId1"
-    receivedAt={Date.now() - 4 * 60 * 1000}
+    sentAt={Date.now() - 4 * 60 * 1000}
     onClick={result => console.log('onClick', result)}
     i18n={util.i18n}
   />
@@ -61,7 +61,7 @@
     snippet="What's <<left>>going<<right>> on?"
     id="messageId1"
     conversationId="conversationId1"
-    receivedAt={Date.now() - 3 * 60 * 1000}
+    sentAt={Date.now() - 3 * 60 * 1000}
     onClick={result => console.log('onClick', result)}
     i18n={util.i18n}
   />
@@ -75,7 +75,7 @@
     snippet="How is everyone? <<left>>Going<<right>> well?"
     id="messageId2"
     conversationId="conversationId2"
-    receivedAt={Date.now() - 27 * 60 * 1000}
+    sentAt={Date.now() - 27 * 60 * 1000}
     onClick={result => console.log('onClick', result)}
     i18n={util.i18n}
   />
@@ -99,7 +99,7 @@
     snippet="What's <<left>>going<<right>> on?"
     id="messageId1"
     conversationId="conversationId1"
-    receivedAt={Date.now() - 3 * 60 * 1000}
+    sentAt={Date.now() - 3 * 60 * 1000}
     onClick={result => console.log('onClick', result)}
     i18n={util.i18n}
   />
@@ -116,7 +116,7 @@
     snippet="How is everyone? <<left>>Going<<right>> well?"
     id="messageId2"
     conversationId="conversationId2"
-    receivedAt={Date.now() - 27 * 60 * 1000}
+    sentAt={Date.now() - 27 * 60 * 1000}
     onClick={result => console.log('onClick', result)}
     i18n={util.i18n}
   />
@@ -137,7 +137,7 @@
     snippet="Tuesday: Ate two <<left>>apple<<right>>s"
     id="messageId1"
     conversationId="conversationId1"
-    receivedAt={Date.now() - 3 * 60 * 1000}
+    sentAt={Date.now() - 3 * 60 * 1000}
     onClick={result => console.log('onClick', result)}
     i18n={util.i18n}
   />
@@ -160,7 +160,7 @@
     snippet="<<left>>Just<<right>> a second"
     id="messageId1"
     conversationId="conversationId1"
-    receivedAt={Date.now() - 7 * 60 * 1000}
+    sentAt={Date.now() - 7 * 60 * 1000}
     onClick={result => console.log('onClick', result)}
     i18n={util.i18n}
   />
@@ -183,7 +183,7 @@
     snippet="I'm pretty <<left>>excited<<right>>!"
     id="messageId1"
     conversationId="conversationId1"
-    receivedAt={Date.now() - 30 * 60 * 1000}
+    sentAt={Date.now() - 30 * 60 * 1000}
     onClick={result => console.log('onClick', result)}
     i18n={util.i18n}
   />
@@ -207,7 +207,7 @@
     snippet="This is a really <<left>>detail<<right>>ed long line which will wrap and only be cut off after it gets to three lines. So maybe this will make it in as well?"
     id="messageId1"
     conversationId="conversationId1"
-    receivedAt={Date.now() - 17 * 60 * 1000}
+    sentAt={Date.now() - 17 * 60 * 1000}
     onClick={result => console.log('onClick', result)}
     i18n={util.i18n}
   />
@@ -224,7 +224,7 @@
     snippet="Okay, here are the <<left>>detail<<right>>s:\n\n1355 Ridge Way\nCode: 234\n\nI'm excited!"
     id="messageId2"
     conversationId="conversationId2"
-    receivedAt={Date.now() - 10 * 60 * 60 * 1000}
+    sentAt={Date.now() - 10 * 60 * 60 * 1000}
     onClick={result => console.log('onClick', result)}
     i18n={util.i18n}
   />
diff --git a/ts/components/MessageSearchResult.tsx b/ts/components/MessageSearchResult.tsx
index e9f4195c800..360bf2e0818 100644
--- a/ts/components/MessageSearchResult.tsx
+++ b/ts/components/MessageSearchResult.tsx
@@ -14,7 +14,7 @@ export type PropsDataType = {
 
   id: string;
   conversationId: string;
-  receivedAt: number;
+  sentAt: number;
 
   snippet: string;
 
@@ -128,7 +128,7 @@ export class MessageSearchResult extends React.PureComponent<PropsType> {
       isSelected,
       conversationId,
       openConversationInternal,
-      receivedAt,
+      sentAt,
       snippet,
       to,
     } = this.props;
@@ -155,7 +155,7 @@ export class MessageSearchResult extends React.PureComponent<PropsType> {
           <div className="module-message-search-result__header">
             {this.renderFrom()}
             <div className="module-message-search-result__header__timestamp">
-              <Timestamp timestamp={receivedAt} i18n={i18n} />
+              <Timestamp timestamp={sentAt} i18n={i18n} />
             </div>
           </div>
           <div className="module-message-search-result__body">