Fixed mail attachment issue