more progress on invitation message handling