Re-add ability to use tokens in attachment areas