This calls message-update-smtp-method-header before message-send-hook, but I could also see adding message-update-smtp-method-header to the hook in message.el, so that a user may remove it if needed. -- Philip Kaludercic