Mail format changes and bug fixes on job message
Conflicts resolved
corrections