Simplified build and added MapiMail