     {message} = message  unless message.typeConstant?
     {_inScreenMap}  = KD.singletons.socialapi
 
-    {messageId, body, initialChannelId} = message
-
-    type = messageId or initialChannelId
-    token = getScreenMapToken body, type
-
-    inside = _inScreenMap[token]
+    {id, clientRequestId} = message
+
+    inside = _inScreenMap[id] or _inScreenMap[clientRequestId]
 
     return not inside
 



  addToScreenMap = (options) ->

    {messageId, body, channelId} = options
    {_inScreenMap} = KD.singletons.socialapi

    type  = messageId or channelId
    token = getScreenMapToken body, type

    _inScreenMap[token] = yes


  messageRequesterFn = (options) ->


    KD.singletons.socialapi.cacheItem m

    addToScreenMap { messageId: m.id, clientRequestId: m.clientRequestId }

    return m

