Do not wait til message is sent, to avoid delays

Merged Santiago Said requested to merge DoNotForceSendingMail into 11.0-stage

Merge request reports