updating mail form to no longer use our fork fixes #3603