[Mail] Refactoring + force contentType/charset