     currentMessage = MessageStore.getCurrentID() or 'not-null'
     conversationIDs = target.conversationIDs or [target.conversationID]
     currentConversation = MessageStore.getCurrentConversationID() or 'not-null'
-    if currentMessage in messageIDs
-        next = MessageStore.getNextOrPrevious false
-        # MessageActionCreator.setCurrent next.get('id'), true
-        window.cozyMails.messageDisplay next, false
-    else if currentConversation in conversationIDs
-        next = MessageStore.getNextOrPrevious true
+    isConv = currentMessage not in messageIDs
+    isConv = true
+    next = MessageStore.getNextOrPrevious isConv
+    if next?
         # MessageActionCreator.setCurrent next.get('id'), true
         window.cozyMails.messageDisplay next, false
 

    AppDispatcher.handleViewAction
        type: ActionTypes.LAST_ACTION
        value: {actions}

    _fixCurrentMessage target

    return updated


            newMailboxIds[trashMailbox] = -1
            updated.push(message.set('mailboxIDs', newMailboxIds).toJS())

    _fixCurrentMessage target

    # immediately apply change to refresh UI
    # Update datastore
    AppDispatcher.handleViewAction
