Right now in the email template builder, we can use conditional logic based on custom fields on the contact. I would like opportunity custom fields added to this.

I understand that these opportunity custom fields would only work correctly if the email template is used in a workflow with an opportunity trigger. I'm good with that. I have email templates I've created that are only sent when an opportunity is created or the stage is changed.

Also, we need better conditional logic in general that allows for "contains", "does not contain", etc. Right now, we can only choose "is" and "is not". Those are good and required, but very limiting.