Moved the extra_headers SMTP headers to after the standard SMTP headers