fixes #1389

reorganize parent/child messages into helpers