Can you enable these placeholders in payment thank you email setting?

During we do the record payment after invoice issued, we can select and fill in these two fields"payment method" and "note". BUT these two fields do not included in the placeholders for "payment thank you email setting". Can you add these? we treat "payment thank you" as our "official receipt". We are not only email it to client, we will print it out for our account record purpose. We think these two fields are too important for us..Can you help us?