diff --git a/js/expiring_messages.js b/js/expiring_messages.js index 2421de8d5..3cdf2fbd7 100644 --- a/js/expiring_messages.js +++ b/js/expiring_messages.js @@ -12,6 +12,9 @@ expired.on('add', function(message) { console.log('message', message.get('sent_at'), 'expired'); message.getConversation().trigger('expired', message); + + // We delete after the trigger to allow the conversation time to process + // the expiration before the message is removed from the database. message.destroy(); }); expired.on('reset', checkExpiringMessages);