Refactoring of the mail Step 2 (Gmail is replaced by a generic mail service)