diff --git a/js/models/conversations.js b/js/models/conversations.js
index 4b674503e..218202f84 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -2288,6 +2288,16 @@
       });
     },
 
+    removeMessage(messageId) {
+      const message = this.messageCollection.models.find(
+        msg => msg.id === messageId
+      );
+      if (message) {
+        message.trigger('unload');
+        this.messageCollection.remove(messageId);
+      }
+    },
+
     deleteMessages() {
       Whisper.events.trigger('showConfirmationDialog', {
         message: i18n('deleteConversationConfirmation'),
diff --git a/js/models/messages.js b/js/models/messages.js
index b79307473..ce16c06d5 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -357,9 +357,6 @@
     onDestroy() {
       this.cleanup();
     },
-    deleteMessage() {
-      this.trigger('delete', this);
-    },
     async cleanup() {
       MessageController.unregister(this.id);
       this.unload();