 
         messageID = param.messageID or @getCurrentID()
         conversationID = param.conversationID or @getByID(messageID)?.get 'conversationID'
-        messages = _messagesWithInFlights()
+        messages = @getMessagesToDisplay()
 
         # In this case, we just want
         # next/previous message from a selection

    dedupConversation = ->
        conversationIDs = []
        return filter = (message) ->
            conversationID = message.get 'conversationID'
            if conversationID and conversationID in conversationIDs
                false
            else
                conversationIDs.push conversationID
                return true


            # TODO : regroup message by its conversationID
            # and use messages.find instead with a simple test
            # FIXME : inconsistency between the 2 results, see why?
            index0 = messages.toArray().findIndex (message, index) ->
                isSameMessage = conversationID is message?.get 'conversationID'
                isNextSameConversation = _getMessage(index)?.get('conversationID') isnt conversationID
                return isSameMessage and isNextSameConversation
