more email header tweaking