Added MailComposer, fixed mailService and courseService