Merge remote-tracking branch 'chiiph/bug/refactor_mail_utils' into develop