> On 23 Apr 2025, at 3:36 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
> Aditya Garg <gargaditya08@xxxxxxxx> writes:
>
>> Outlook does not accept the Message-ID header in the email body. Instead
>> it saves it in its own proprietary X-Microsoft-Original-Message-ID
>> header and a random Message-ID is set my the server. As a result,
>> replying to threads does not work.
>>
>> The $smtp->message variable in this script for outlook is something like
>> this:
>>
>> 2.0.0 OK <Message-ID> [Hostname=Some-hostname]
>>
>> This contains the Message-ID set by Microsoft in the first <>.
>>
>> This patch retrieves the Message-ID from this server response
>> and sets it in the email headers instead of using the self generated one.
>
> Hmph.
>
> send_message calls gen_header as the first thing. This prepares the
> usual From:/To:/Subject:/Date:/Message-ID: lines and returns the
> header text as well as recipient addresses broken out into different
> classes, among other things.
>
>> Signed-off-by: Aditya Garg <gargaditya08@xxxxxxxx>
>> ---
>> git-send-email.perl | 11 +++++++++++
>> 1 file changed, 11 insertions(+)
>>
>> diff --git a/git-send-email.perl b/git-send-email.perl
>> index a6cafda29c..216b23caa5 100755
>> --- a/git-send-email.perl
>> +++ b/git-send-email.perl
>> @@ -1799,6 +1799,17 @@ sub send_message {
>
> And before these pre-context lines, the composed $header that
> contains the message_id has already been sent by calling datasend()
> method on the smtp object. After that, we are ...
>
>> $smtp->datasend("$line") or die $smtp->message;
>> }
>
> ... sending the body of the e-mail here.
>
> So it is not clear to me how ovewriting the $message_id variable
> after the message with $header with "Message-ID:" line that
> contained the ID we generated has already given to the SMTP server.
> What the code is doing certainly contradicts with what the proposed
> log message explains it does, i.e.
>
> ... sets it in the email headers instead of using ...
>
> It would affect the message-ID that is used by subsequent messages
> when they are sent as replies to this message. I do not think we
> computed the header (the In-Reply-To: field) for the next message
> at this point of the code, and I can well believe that mucking with
> the $message variable at this point would make the next message
> correctly a response to this one.
>
> Perhaps you meant that Outlook DISCARDS the Message-ID: field in the
> message it was instructed to send out, and INSERTS its own? Then I
> can see how this patch would improve the situation, but the last
> paragraph in the proposed log message needs to be rewritten.
Exactly. We don't care what message id the script is sending here. We just
send the first mail, and then retrieve the message ID that was set by outlook.
Then we change the variable so that In-reply-to and References work properly.
> After sending a message, retrieve the message-ID the Outlook
> server assigned to the message and store it in $message_id
> variable; this value will be used when next and subsequent
> message are sent as replies to the message, preserving the
> threading of the messages.
>
> or something.
>
I'll change the log message, although it seemed clear to me.
>> + # Retrieve the Message-ID from the server response in case of Outlook
>> + if ($smtp_server eq 'smtp.office365.com' || $smtp_server eq 'smtp-mail.outlook.com') {
>
> Perhaps a small helper sub
>
> sub is_outlook {
> my ($host) = @_;
> return ($host eq '...' ||
> $host eq '...');
> }
>
> would make it easier to maintain (and read).
Ok
>
>> + if ($smtp->message =~ /<([^>]+)>/) {
>> + $message_id = "<$1>";
>> + printf __("Outlook: Retrieved Message-ID: %s\n"), $message_id;
>
> Is this worth reporting, or more or less a leftover debugging aid?
>
> The fact that we retrieved (as opposed to "could not retrieve" case)
> may have been significant during the development of this feature,
> but to end-users who see this message, retrieved is not at all
> interesting. What is interesting to them is that the server gave
> your message some random Message-ID you've never heard of, so while
> it may make sense to report what that ID is, perhaps
>
> Outlook reassigned Messsage-ID: %s
>
> might be more meaningful to them. rewritten, reassigned, used,
> there may be even better verbs, but the point is that the subject of
> that sentence is the outlook smtp serveron the other end of the
> connection (as opposed to the actor of "retrived" is the program
> running on our end).
I'll change the message, and having some message about this IMO
should be there.
>
>> + } else {
>> + warn __("Warning: Could not retrieve Message-ID from server response.\n");
>> + }
>> + }
>> +
>> $smtp->code =~ /250|200/ or die sprintf(__("Failed to send %s\n"), $subject).$smtp->message;
>> }
>> if ($quiet) {
