More <message-dialog> fixes.