     {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
 


    KD.singletons.socialapi.cacheItem m

    addToScreenMap {channelId: m.initialChannelId, body: m.body}

    return m




  addToScreenMap = (options) ->
    {messageId, clientRequestId} = options
    {_inScreenMap} = KD.singletons.socialapi

    _inScreenMap[clientRequestId] = yes  if clientRequestId
    _inScreenMap[messageId]       = yes  if messageId


  messageRequesterFn = (options) ->
