Changed core loader

Loader changed for loading the mail classes.