Fix messages broken in r14616. Thanks to Arfrever for reporting and thanks to