Improves my previous commit by saving the mail during edition