From f1d70361c9396a6beac04b39fddea0c5878881ca Mon Sep 17 00:00:00 2001 From: Michal Horejsek Date: Mon, 2 Nov 2020 14:15:04 +0100 Subject: [PATCH] Do not include conversation ID in references --- Changelog.md | 1 + pkg/message/header.go | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index 69b23a1b..765c3fd4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,6 +10,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/) ### Fixed * GODT-847 Waiting for unilateral update during deleting the message. * GODT-849 Show in error counts in the end also lost messages. +* GODT-835 Do not include conversation ID in references to show properly conversation threads in clients. ## [IE 1.2.0] Elbe diff --git a/pkg/message/header.go b/pkg/message/header.go index 5fda7cc4..5a633f91 100644 --- a/pkg/message/header.go +++ b/pkg/message/header.go @@ -84,10 +84,6 @@ func GetHeader(msg *pmapi.Message) textproto.MIMEHeader { //nolint[funlen] } if msg.ConversationID != "" { h.Set("X-Pm-ConversationID-Id", msg.ConversationID) - if references := h.Get("References"); !strings.Contains(references, msg.ConversationID) { - references += " <" + msg.ConversationID + "@" + pmapi.ConversationIDDomain + ">" - h.Set("References", references) - } } return h