use From header display name
rearrange templating