Using tokens in multisite setup

Originally posting http://drupal.org/node/373558, then realized this forum, so repeating here...

I'm using the workflow-ng (5.x-2.1) and token (5.x-1.11) modules to generate email connection requests from buddylist2 (5.x-1.0-beta2). I have two sites, one DB. Users and content is shared across the sites.

Use case: userA@site-nameA initiates s connection request to userB@site-nameB

I want the connection request sent to userB@site-nameB to say

*******
From: no-reply@domainB
Subject: connection request from userA

Message:
Hi userB,

userA at site-nameB wants to connect with you...
*******

For the from address I tried using the token [userB:site-email], but instead it uses the [userA:site-email] email address. For site-nameB in the message body I tried [userB:site-name], but it picks up [userA:site-name].

Each domain has its own settings.php and the variables table is shared.

Any ideas how to resolve this?

Thanks,
M