Added email's subject patch provided by @PabloHoffman