fix: mail sending, complete previous commit
Merge branch 'freeze' into develop