(CE-610) Add gender support to a few more messages