Updated the mail form. It works like a charm.