[#361] fixes mailer
Merge pull request #525 from MGhanem/fixes_social_mailer

[#361] fixes mailer
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into timo_fixing_tests