diff --git a/README.md b/README.md
index 9d60ad7..e1d041f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Thunderbird Add-on "Correct Identity" (v2.4.x)
+Thunderbird Add-on "Correct Identity" (v2.5.x)
==============================================
This add-on version works with Thunderbird versions >= 102.0
@@ -44,9 +44,19 @@ Features
* based on the original recipients of the replied-to message
* **NEW in 2.4.x:** based on addressbook entries
* based on non-standard SMTP header fields of the replied-to message (**new feature**: "Advanced: Additional mail headers")
+ * **NEW in 2.5.x:** use any matched address as "from" to support "catch-all" mail server configurations
* Automatically change the "from" identity when addressing specific recipients
* Warn if specific recipients are included in a email send from a specific identity
+### **NEW in 2.5.x:** Use matching address as "from"
+In mail servers with "catch-all" configuration, all mails with any destination email address received by that server are forwarded to a single mailbox. E.g. \*@mailbox.test with "\*" being any local part of the address.
+
+Examples: `info@mailbox.test, unknown.user@mailbox.test, some.random.address@mailbox.test` etc.
+
+Correct identity addon allow to use that address as "from" when replying such an email. E.g. use "mailbox.test" as detection search pattern and choose "use the found ... as from" option.
+In this use case, the "from" email-address is different from the selected sender identity. If you like to keep your sender identity hidden from the final mail recipients, please check if your mail server does not leak that information in the outgoing emails (e.g. by checking the "source" view of a received sample email).
+
+
### **NEW in 2.4.x:** Addressbook Match
Instead of using individual match entries, also a complete addressbook can be checked for a match.
As an example you can add the following line to the text field:
@@ -93,7 +103,7 @@ Steps for installation (local build):
4. Open Thunderbird, go to /Add-ons/, and click /Install add-on from file/
5. Choose the .xpi file in the repository folder
-The .xpi files come in two flavours:
+The .xpi files come in two flavors:
* correct_identity_vX.Y.Z.xpi is a version which could (in theory) be released to the [official Thunderbird add-on store](https://addons.thunderbird.net/)
* correct_identity_vX.Y.Z_dev.xpi has the same content, but has no limitation on the highest supported Thunderbird version ("strict_max_version"). Use this version to test this add-on on newer Thunderbird versions not known at date of the add-on release. (Feedback welcome).
@@ -119,6 +129,18 @@ Note that you have to generate a .xpi file *with the same name* whenever you cha
In Menu /Extras/ → /Development Tools/ you'll also find a dev console and more debugging tools.
+Flowchart
+---------
+
+The configuration options are sometimes confusing. A more formal description of the detection mechanism can be found in the flowchart below. But first we "label" the configuration options in the config page.
+
+
+
+Flow diagram to determine the final "from" identity and email-address:
+
+
+
+
Acknowledgment
--------------
diff --git a/_locales/de-DE/messages.json b/_locales/de-DE/messages.json
index 71fdc33..e8631f3 100644
--- a/_locales/de-DE/messages.json
+++ b/_locales/de-DE/messages.json
@@ -71,10 +71,10 @@
"message": "versuchen, die Identität zu suchen und zu benutzen, die in der Empfängerliste erscheint"
},
"CorrectIdentity.keepRecipientAddress": {
- "message": "keep the sender address that appears in its recipient list, even if it does not match the identity (e.g., for catch-all adresses)"
+ "message": "verwende eine erkannte (und ggf. abweichende) Mailadresse als \"von\" zusammen mit dieser Identität (z.B. für Mailserver mit \"catch-all\" Konfiguration)"
},
"CorrectIdentity.removeSenderFromRecipients": {
- "message": "remove the identity from the recipient list"
+ "message": "entferne die Identität aus der Empfängerliste (Wenn sie als Absender benutzt wird)"
},
"CorrectIdentity.safetyCaption": {
"message": "Sicherheit"
diff --git a/_locales/en-US/messages.json b/_locales/en-US/messages.json
index 0ceb90e..79710b8 100644
--- a/_locales/en-US/messages.json
+++ b/_locales/en-US/messages.json
@@ -72,10 +72,10 @@
"message": "attempt to find and use an identity that appears in its recipient list"
},
"CorrectIdentity.keepRecipientAddress": {
- "message": "keep the sender address that appears in its recipient list, even if it does not match the identity (e.g., for catch-all adresses)"
+ "message": "use the found matching address from the recipient list as \"from\", even if it does not match this identity (e.g. for mail servers with catch-all addresses)"
},
"CorrectIdentity.removeSenderFromRecipients": {
- "message": "remove the identity from the recipient list"
+ "message": "remove this identity from the recipient list (while used as \"from\" identity)"
},
"CorrectIdentity.safetyCaption": {
"message": "Safety"
diff --git a/_locales/fr-FR/messages.json b/_locales/fr-FR/messages.json
index 0482378..000fbda 100644
--- a/_locales/fr-FR/messages.json
+++ b/_locales/fr-FR/messages.json
@@ -48,10 +48,10 @@
"message": "tenter de trouver et d’utiliser une identité qui apparaîtrait dans la liste des destinataires du message."
},
"CorrectIdentity.keepRecipientAddress": {
- "message": "keep the sender address that appears in its recipient list, even if it does not match the identity (e.g., for catch-all adresses)"
+ "message": "utiliser comme adresse d'expéditeur l'adresse trouvé dans la liste de destinataires, même si elle ne correspond pas à l'identité (par exemple dans le cas d'un compte de messagerie catch-all)"
},
"CorrectIdentity.removeSenderFromRecipients": {
- "message": "remove the identity from the recipient list"
+ "message": "supprimer cette identité de la liste des destinataires (alors qu'elle est utilisée comme expéditeur)"
},
"CorrectIdentity.safetyCaption": {
"message": "Sécurité"
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index 7cc3002..8bef893 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -48,10 +48,10 @@
"message": "返信元のメッセージからアイデンティティの同一性を検出して適用する"
},
"CorrectIdentity.keepRecipientAddress": {
- "message": "keep the sender address that appears in its recipient list, even if it does not match the identity (e.g., for catch-all adresses)"
+ "message": "受信者リストで一致したアドレスは、たとえそのアドレスがこのアイデンティティに一致しなくても（例えば、キャッチオール・アドレスを持つメールサーバーの場合）、「送信者」アドレスとして使われる"
},
"CorrectIdentity.removeSenderFromRecipients": {
- "message": "remove the identity from the recipient list"
+ "message": "このアイデンティティを受信者リストから削除する（送信者として使用する"
},
"CorrectIdentity.safetyCaption": {
"message": "安全"
diff --git a/_locales/nl-NL/messages.json b/_locales/nl-NL/messages.json
index 0082c50..f851cdf 100644
--- a/_locales/nl-NL/messages.json
+++ b/_locales/nl-NL/messages.json
@@ -48,10 +48,10 @@
"message": "detecteer en gebruik de identiteit die voorkomt in de ontvangerslijst"
},
"CorrectIdentity.keepRecipientAddress": {
- "message": "keep the sender address that appears in its recipient list, even if it does not match the identity (e.g., for catch-all adresses)"
+ "message": "een erkend (en mogelijk ander) mailadres gebruiken als \"van\" samen met deze identiteit (bijv. voor mailservers met een “catch-all” configuratie)"
},
"CorrectIdentity.removeSenderFromRecipients": {
- "message": "remove the identity from the recipient list"
+ "message": "identiteit verwijderen uit de ontvangerslijst (bij gebruik als afzender)"
},
"CorrectIdentity.safetyCaption": {
"message": "Veiligheid"
diff --git a/flow.drawio b/flow.drawio
deleted file mode 100644
index c2c5899..0000000
--- a/flow.drawio
+++ /dev/null
@@ -1,314 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/icons/ci.svg b/icons/ci.svg
index 51fc902..05df3af 100644
--- a/icons/ci.svg
+++ b/icons/ci.svg
@@ -7,19 +7,7 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
-
-
-
-
-
diff --git a/images/flow-configs.png b/images/flow-configs.png
new file mode 100644
index 0000000..ef3d7ef
Binary files /dev/null and b/images/flow-configs.png differ
diff --git a/images/flow-flow.png b/images/flow-flow.png
new file mode 100644
index 0000000..0e9fd40
Binary files /dev/null and b/images/flow-flow.png differ
diff --git a/images/flow.drawio b/images/flow.drawio
new file mode 100644
index 0000000..a08a0cd
--- /dev/null
+++ b/images/flow.drawio
@@ -0,0 +1,265 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/images/settings.png b/images/settings.png
index e4572bd..6886b86 100644
Binary files a/images/settings.png and b/images/settings.png differ
diff --git a/manifest.json b/manifest.json
index 634f2a6..d261e9c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
"gecko": {
"id": "{47ef7cc0-2201-11da-8cd6-0800200c9a66}",
"strict_min_version": "102.0",
- "strict_max_version": "128.*"
+ "strict_max_version": "134.*"
}
},
"default_locale": "en-US",
diff --git a/options.html b/options.html
index 45381d5..bb79d74 100644
--- a/options.html
+++ b/options.html
@@ -109,6 +109,7 @@
id="keepRecipientAddress" name="keepRecipientAddress"
value="keepRecipientAddress">
+