I am still looking for a solution to this problem.  Without manually adding the client name on every single subject line of every single invoice email....Can we include a field like [Customer Name] in the email message setting so every email will be sent with the respective Customer company name on the email subject line?