Fixing Email Template Building into War