Important changes to multi-receiver message logic