Add support and tests for heap integration.

No, my point is that it probably isn't valid to supply message.sessionId as a email or handle for user, which it looks like is what this is used for.