Fixes en activity send mails
Merge remote-tracking branch 'origin/master'