Handle rexi-tagged messages

BugzID: 20204
Merge commit 'ab1fa68' from #14

BugzID: 20204