fix: mail fixed
Merge branch 'freeze' into develop