diff --git a/js/models/messages.js b/js/models/messages.js
index 4e1c1ba33..86f440ef0 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -614,6 +614,8 @@
       // for the public group chat
       const conversation = this.getConversation();
 
+      const isModerator = conversation && !!conversation.isModerator(this.OUR_NUMBER);
+
       const convoId = conversation ? conversation.id : undefined;
       const isGroup = !!conversation && !conversation.isPrivate();
 
@@ -654,10 +656,9 @@
           conversation.isModerator(phoneNumber),
         isDeletable:
           !this.get('isPublic') ||
-          conversation && conversation.isModerator(this.OUR_NUMBER) ||
-          this.getSource() === this.OUR_NUMBER,
-        isModerator:
-          conversation && !!conversation.isModerator(this.OUR_NUMBER),
+          isModerator ||
+          phoneNumber === this.OUR_NUMBER,
+        isModerator: isModerator
 
         onCopyText: () => this.copyText(),
         onSelectMessage: () => this.selectMessage(),