[RCD] Patch to mark/flag message