refactor: tidy up submission_email
references
#3633
Merged
submission_email
references
#3633