Merge "Get Email units to compile" into ub-mail-master