some cleanup and adding mail headers
correctly renamed faked lib