mailsender refactored
Merge remote-tracking branch 'origin/wibesa' into wibesa