Move mail_view outside development