From d2df8d0630537b6cd45bb3a678416b8a11a89ca0 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 14 Feb 2023 09:46:33 +0100 Subject: [PATCH] Native DKIM: fixed simple header name/value --- .../main/java/eu/faircode/email/MessageHelper.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 932b8f2665..e10ec1f2bf 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -2084,13 +2084,18 @@ public class MessageHelper { if ("DKIM-Signature".equals(key)) head.append(key).append(": ").append(value); else { - // Find original header/name + // Find original header/name (case sensitive) + int _idx = values.length - idx; Enumeration
oheaders = ih.getAllHeaders(); while (oheaders.hasMoreElements()) { Header oheader = oheaders.nextElement(); - if (key.equalsIgnoreCase(oheader.getName())) - head.append(oheader.getName()).append(": ") - .append(oheader.getValue()); + if (key.equalsIgnoreCase(oheader.getName())) { + if (_idx-- == 0) { + head.append(oheader.getName()).append(": ") + .append(oheader.getValue()); + break; + } + } } } } else if ("relaxed".equals(c[0])) {