diff --git a/js/models/conversations.js b/js/models/conversations.js
index 66239fca1a0..edaa94ac1c9 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -409,12 +409,14 @@
         await this.initialPromise;
         const verified = await this.safeGetVerified();
 
-        this.set({ verified });
+        if (this.get('verified') !== verified) {
+          this.set({ verified });
 
-        // we don't await here because we don't need to wait for this to finish
-        window.Signal.Data.updateConversation(this.id, this.attributes, {
-          Conversation: Whisper.Conversation,
-        });
+          // we don't await here because we don't need to wait for this to finish
+          window.Signal.Data.updateConversation(this.id, this.attributes, {
+            Conversation: Whisper.Conversation,
+          });
+        }
 
         return;
       }
diff --git a/js/models/messages.js b/js/models/messages.js
index 1e428add292..df2829e5892 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -516,7 +516,7 @@
     findAndFormatContact(phoneNumber) {
       const contactModel = this.findContact(phoneNumber);
       if (contactModel) {
-        return contactModel.getProps();
+        return contactModel.format();
       }
 
       const { format } = PhoneNumber;
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index af75247981e..0ed600dbfe3 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -178,10 +178,12 @@
         this.model.updateVerified.bind(this.model),
         1000 // one second
       );
-      this.throttledGetProfiles = _.throttle(
-        this.model.getProfiles.bind(this.model),
-        1000 * 60 * 5 // five minutes
-      );
+      this.model.throttledGetProfiles =
+        this.model.throttledGetProfiles ||
+        _.throttle(
+          this.model.getProfiles.bind(this.model),
+          1000 * 60 * 5 // five minutes
+        );
       this.debouncedMaybeGrabLinkPreview = _.debounce(
         this.maybeGrabLinkPreview.bind(this),
         200
@@ -1500,23 +1502,6 @@
     },
 
     async onOpened(messageId) {
-      this.openStart = Date.now();
-      this.lastActivity = Date.now();
-
-      this.focusMessageField();
-      this.model.updateLastMessage();
-
-      const statusPromise = this.throttledGetProfiles();
-      // eslint-disable-next-line more/no-then
-      this.statusFetch = statusPromise.then(() =>
-        // eslint-disable-next-line more/no-then
-        this.model.updateVerified().then(() => {
-          this.onVerifiedChange();
-          this.statusFetch = null;
-          window.log.info('done with status fetch');
-        })
-      );
-
       if (messageId) {
         const message = await getMessageById(messageId, {
           Message: Whisper.Message,
@@ -1532,10 +1517,24 @@
 
       this.loadNewestMessages();
 
+      this.focusMessageField();
+
       const quotedMessageId = this.model.get('quotedMessageId');
       if (quotedMessageId) {
         this.setQuoteMessage(quotedMessageId);
       }
+
+      this.model.updateLastMessage();
+
+      const statusPromise = this.model.throttledGetProfiles();
+      // eslint-disable-next-line more/no-then
+      this.statusFetch = statusPromise.then(() =>
+        // eslint-disable-next-line more/no-then
+        this.model.updateVerified().then(() => {
+          this.onVerifiedChange();
+          this.statusFetch = null;
+        })
+      );
     },
 
     async retrySend(messageId) {
@@ -2424,7 +2423,7 @@
       const trimmed =
         messageText && messageText.length > 0 ? messageText.trim() : '';
 
-      if ((this.model.get('draft') && !messageText) || trimmed.length === 0) {
+      if (this.model.get('draft') && (!messageText || trimmed.length === 0)) {
         this.model.set({
           draft: null,
         });