fix_mailservice

Merged bee26 requested to merge fix_mailservice into master

Merge request reports