     *
     * @return {Array}
     ###
-    getMessagesToDisplay: (mailboxID, useConversations) ->
-        conversationIDs = []
-
+    getMessagesToDisplay: (mailboxID) ->
+        return _currentMessages unless mailboxID
+
+        # We dont filter for type from and dest because it is
+        # complicated by collation and name vs address.
+        # Instead we clear the message, see QUERY_PARAMETER_CHANGED handler.
+
+        # Get Messages from Mailbox
         sequence = _messagesWithInFlights()
         sequence = sequence.filter inMailbox mailboxID
 
+        # Apply List.Filters
         filter = _getFilter()
         if filter.type is 'flag'
             sequence = sequence.filter _matchFlag
-
         else if filter.type is 'date'
             sequence = sequence.filter _matchRangeDate
-
-
-        # We dont filter for type from and dest because it is
-        # complicated by collation and name vs address.
-        # Instead we clear the message, see QUERY_PARAMETER_CHANGED handler.
-
-        if useConversations
-            sequence = sequence.filter dedupConversation()
-
-
         sequence = sequence.sort getSortFunction filter.field, filter.order
+
+        # Get uniq conversations
+        sequence = sequence.filter dedupConversation()
+
         _currentMessages = sequence.toOrderedMap()
-
         return _currentMessages
 
 

            # 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.findIndex (message, index) ->
                isSameMessage = conversationID is message?.get 'conversationID'
                isNextSameConversation = _getMessage(index)?.get('conversationID') isnt conversationID
                return isSameMessage and isNextSameConversation

    dedupConversation = ->
        conversationIDs = []
        return filter = (message) ->
            unless (conversationID = message.get 'conversationID') in conversationIDs
                conversationIDs.push conversationID
                return true

