apply removal of mailbox_name field