diff --git a/Changelog.md b/Changelog.md
index 2f6481ec..17a6a88b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -15,6 +15,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-356 Fix crash when removing account while mail client is fetching messages (regression from GODT-204).
 * GODT-390 Don't logout user if AuthRefresh fails because internet was off.
 * GODT-358 Bad timeouts with Alternative Routing
+* GODT-363 Drafts are not deleted when already created on webapp.
 
 * GODT-390 Don't logout user if AuthRefresh fails because internet was off
 * GODT-341 Fixed flaky unittest for Store synchronization cooldown
diff --git a/internal/smtp/user.go b/internal/smtp/user.go
index 6eb4fc14..9d3e7d7a 100644
--- a/internal/smtp/user.go
+++ b/internal/smtp/user.go
@@ -379,7 +379,7 @@ func (su *smtpUser) handleReferencesHeader(m *pmapi.Message) (draftID, parentID
 		} else { // internalid is the parentID.
 			idMatch := regexp.MustCompile(pmapi.InternalReferenceFormat).FindStringSubmatch(reference)
 			if len(idMatch) > 0 {
-				lastID := idMatch[0]
+				lastID := strings.TrimSuffix(strings.Trim(idMatch[0], "<>"), "@protonmail.internalid")
 				filter := &pmapi.MessagesFilter{ID: []string{lastID}}
 				if su.addressID != "" {
 					filter.AddressID = su.addressID