change config & fix mail headers