This optimisation only makes sense when the message is neither mandatory nor confirmable!
Merge bug24408 (again)