Moved Mail to different package.