Add save mail message after fails and revert ms