MDL-66477 message: Use the generic drawer for the message drawer