Better fix for email text / signature integration

I followed your advice. Much better like this :)
Didn't know these 2 dol_ functions, now I do.