[imp] [33745] Make enqueueMessage more DRY; Fixes #3612