Changed the mail construction, especially the from line and the subject.