Skip to content

#2660 Fix: sending a secure reply using the created draft produces a new thread issue #2677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sosnovsky merged 1 commit into from
Aug 7, 2025
Merged

#2660 Fix: sending a secure reply using the created draft produces a new thread issue #2677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion FlowCrypt/Functionality/Mail Provider/Message Provider/Gmail+Message.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ extension GmailService: MessageProvider {

let query = createMessageQuery(identifier: identifier, format: kGTLRGmailFormatFull)
return try await withCheckedThrowingContinuation { continuation in
self.gmailService.executeQuery(query) { _, data, error in
self.gmailService.executeQuery(query) {
_,
data,
error in
if let error {
return continuation.resume(throwing: GmailApiError.providerError(error))
}
Expand Down
6 changes: 5 additions & 1 deletion FlowCrypt/Functionality/Mail Provider/Message Provider/Gmail+MessageExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ extension Message {
var replyTo: String?
var inReplyTo: String?
var rfc822MsgId: String?
var replyToMsgId: String?
var isSuspicious = false

for messageHeader in messageHeaders.compactMap({ $0 }) {
Expand All @@ -58,7 +59,9 @@ extension Message {
case .cc: cc = value
case .bcc: bcc = value
case .replyTo: replyTo = value
case .inReplyTo: inReplyTo = value
case .inReplyTo:
inReplyTo = value
replyToMsgId = value
case .receivedSPF: isSuspicious = value.contains("softfail")
case .identifier: rfc822MsgId = value
default: break
Expand All @@ -84,6 +87,7 @@ extension Message {
bcc: bcc,
replyTo: replyTo,
inReplyTo: inReplyTo,
replyToMsgId: replyToMsgId,
isSuspicious: isSuspicious
)
}
Expand Down