Attempt to fix MailView issue on staging