Refactoring: subscription messages based on subscriptionId only (but not
replies)