diff --git a/pkg/message/parser.go b/pkg/message/parser.go
index 5a7a9cac..a62eb8eb 100644
--- a/pkg/message/parser.go
+++ b/pkg/message/parser.go
@@ -24,6 +24,7 @@ import (
 	"mime"
 	"net/mail"
 	"net/textproto"
+	"regexp"
 	"strings"
 
 	"github.com/ProtonMail/go-rfc5322"
@@ -486,7 +487,7 @@ func parseMessageHeader(m *pmapi.Message, h message.Header) error { // nolint[fu
 			m.Time = date.Unix()
 
 		case "message-id":
-			m.ExternalID = fields.Value()
+			m.ExternalID = regexp.MustCompile("<(.*)>").ReplaceAllString(fields.Value(), "$1")
 		}
 	}
 
diff --git a/unreleased.md b/unreleased.md
index 81ac9feb..34b37d6c 100644
--- a/unreleased.md
+++ b/unreleased.md
@@ -11,3 +11,9 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 ### Changed
 
 ### Fixed
+* GODT-787 GODT-978 Fix IE and Bridge importing to sent not showing up in inbox (setting up flags properly).
+* GODT-1006 Use correct macOS keychain name.
+* GODT-1009 Set ContentID if present and not explicitly attachment.
+* GODT-1006 Use correct macOS keychain name.
+* GODT-1009 Set ContentID if present and not explicitly attachment.
+* GODT-1010 Strip angle brackets from external ID.