I think using &brandShortName; would be more appropriate.
1. &brandShortName; is used in junkMail.dtd
2. Mail refers to Mail component of the Mozilla App. Suite
Created attachment 161196 [details] [diff] [review]
fixed on the aviary 1.0 branch.
This still needs ported to the trunk. Thanks for the fix!
Created attachment 162159 [details] [diff] [review]
fixed on the trunk now too