You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2026/06/23 09:03:12 UTC

(camel) 01/01: CAMEL-23747: camel-mail - useHeader* options default to false for secure-by-default

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch fix/CAMEL-23747
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 77b9a9b3e88e1a1a3482d3e3372f7187cd372b6c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jun 23 11:02:50 2026 +0200

    CAMEL-23747: camel-mail - useHeader* options default to false for secure-by-default
    
    Co-Authored-By: Claude <no...@anthropic.com>
    Signed-off-by: Claus Ibsen <cl...@gmail.com>
---
 .../org/apache/camel/catalog/components/imap.json        | 16 ++++++++--------
 .../org/apache/camel/catalog/components/imaps.json       | 16 ++++++++--------
 .../org/apache/camel/catalog/components/pop3.json        | 16 ++++++++--------
 .../org/apache/camel/catalog/components/pop3s.json       | 16 ++++++++--------
 .../org/apache/camel/catalog/components/smtp.json        | 16 ++++++++--------
 .../org/apache/camel/catalog/components/smtps.json       | 16 ++++++++--------
 .../META-INF/org/apache/camel/component/mail/imap.json   | 16 ++++++++--------
 .../META-INF/org/apache/camel/component/mail/imaps.json  | 16 ++++++++--------
 .../META-INF/org/apache/camel/component/mail/pop3.json   | 16 ++++++++--------
 .../META-INF/org/apache/camel/component/mail/pop3s.json  | 16 ++++++++--------
 .../META-INF/org/apache/camel/component/mail/smtp.json   | 16 ++++++++--------
 .../META-INF/org/apache/camel/component/mail/smtps.json  | 16 ++++++++--------
 .../apache/camel/component/mail/MailConfiguration.java   | 16 ++++++++--------
 .../component/mail/AdditionalMailPropertiesTest.java     |  3 ++-
 .../camel/component/mail/FromFileSendMailTest.java       |  4 +++-
 .../component/mail/MailComponentRecipientSetTest.java    |  7 ++++---
 ...MailHeaderOverrulePreConfigurationRecipientsTest.java |  2 +-
 .../camel/component/mail/MailMimeDecodeHeadersTest.java  |  6 ++++--
 .../camel/component/mail/MailMultipleRecipientsTest.java |  2 +-
 .../mail/MailMultipleRecipientsUsingHeadersTest.java     |  4 +++-
 .../component/mail/MailNameAndEmailInRecipientTest.java  |  3 ++-
 .../camel/component/mail/MailProducerConcurrentTest.java |  2 +-
 .../apache/camel/component/mail/MailProducerTest.java    |  2 +-
 .../apache/camel/component/mail/MailRecipientsTest.java  |  3 ++-
 .../org/apache/camel/component/mail/MailReplyToTest.java |  2 +-
 .../org/apache/camel/component/mail/MailRouteTest.java   |  5 +++--
 .../org/apache/camel/component/mail/MailSubjectTest.java |  3 ++-
 .../component/mail/MailToMultipleEndpointsTest.java      |  8 +++++---
 .../camel/component/mail/MailUsingHeadersTest.java       |  9 ++++++---
 .../camel/component/mail/MailUsingOwnComponentTest.java  |  2 +-
 .../apache/camel/component/mail/RawMailMessageTest.java  |  5 +++--
 .../modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc  | 15 ++++++++++++++-
 .../component/dsl/ImapComponentBuilderFactory.java       |  8 ++++----
 .../component/dsl/ImapsComponentBuilderFactory.java      |  8 ++++----
 .../component/dsl/Pop3ComponentBuilderFactory.java       |  8 ++++----
 .../component/dsl/Pop3sComponentBuilderFactory.java      |  8 ++++----
 .../component/dsl/SmtpComponentBuilderFactory.java       |  8 ++++----
 .../component/dsl/SmtpsComponentBuilderFactory.java      |  8 ++++----
 .../builder/endpoint/dsl/MailEndpointBuilderFactory.java | 16 ++++++++--------
 39 files changed, 195 insertions(+), 164 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imap.json
index 528e5194ae36..c8acd7faaac1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imap.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imaps.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imaps.json
index 29490980c6b6..50239712bcfe 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imaps.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imaps.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3.json
index 7c1b2a8738f2..c4f262f67acf 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3s.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3s.json
index ab465a78b7a5..127c149f97c3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3s.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3s.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtp.json
index b1412ab1abd2..d3258445e177 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtp.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtps.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtps.json
index 158748444389..bd471788502d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtps.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtps.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/imap.json b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/imap.json
index 528e5194ae36..c8acd7faaac1 100644
--- a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/imap.json
+++ b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/imap.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/imaps.json b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/imaps.json
index 29490980c6b6..50239712bcfe 100644
--- a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/imaps.json
+++ b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/imaps.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/pop3.json b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/pop3.json
index 7c1b2a8738f2..c4f262f67acf 100644
--- a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/pop3.json
+++ b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/pop3.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/pop3s.json b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/pop3s.json
index ab465a78b7a5..127c149f97c3 100644
--- a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/pop3s.json
+++ b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/pop3s.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/smtp.json b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/smtp.json
index b1412ab1abd2..d3258445e177 100644
--- a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/smtp.json
+++ b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/smtp.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/smtps.json b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/smtps.json
index 158748444389..bd471788502d 100644
--- a/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/smtps.json
+++ b/components/camel-mail/src/generated/resources/META-INF/org/apache/camel/component/mail/smtps.json
@@ -51,10 +51,10 @@
     "replyTo": { "index": 22, "kind": "property", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email address [...]
     "subject": { "index": 23, "kind": "property", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes precedenc [...]
     "to": { "index": 24, "kind": "property", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoin [...]
-    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configure [...]
-    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpoi [...]
-    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoint [...]
+    "useHeaderFrom": { "index": 25, "kind": "property", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
+    "useHeaderRecipients": { "index": 26, "kind": "property", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
+    "useHeaderReplyTo": { "index": 27, "kind": "property", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
+    "useHeaderSubject": { "index": 28, "kind": "property", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
     "javaMailSender": { "index": 29, "kind": "property", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache.c [...]
     "additionalJavaMailProperties": { "index": 30, "kind": "property", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pro [...]
     "alternativeBodyHeader": { "index": 31, "kind": "property", "displayName": "Alternative Body Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelMailAlternativeBody", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the key to an IN message header t [...]
@@ -127,10 +127,10 @@
     "replyTo": { "index": 30, "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Reply-To recipients (the receivers of the response mail). Separate multiple email addres [...]
     "subject": { "index": 31, "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The Subject of the message being sent. Note: Setting the subject in the header takes preceden [...]
     "to": { "index": 32, "kind": "parameter", "displayName": "To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the destination email address. Separate multiple email addresses with comma." },
-    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpoi [...]
-    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configur [...]
-    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endpo [...]
-    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoin [...]
+    "useHeaderFrom": { "index": 33, "kind": "parameter", "displayName": "Use Header From", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers From and Sender override the sender pre-configured in the endpo [...]
+    "useHeaderRecipients": { "index": 34, "kind": "parameter", "displayName": "Use Header Recipients", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message headers To, CC, and BCC override the recipients pre-configu [...]
+    "useHeaderReplyTo": { "index": 35, "kind": "parameter", "displayName": "Use Header Reply To", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Reply-To overrides the replyTo pre-configured in the endp [...]
+    "useHeaderSubject": { "index": 36, "kind": "parameter", "displayName": "Use Header Subject", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether message header Subject overrides the subject pre-configured in the endpoi [...]
     "javaMailSender": { "index": 37, "kind": "parameter", "displayName": "Java Mail Sender", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.JavaMailSender", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To use a custom org.apache. [...]
     "lazyStartProducer": { "index": 38, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
     "additionalJavaMailProperties": { "index": 39, "kind": "parameter", "displayName": "Additional Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "prefix": "mail.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets additional java mail pr [...]
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index 5e5f5077522e..577a89e34f55 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -114,14 +114,14 @@ public class MailConfiguration implements Cloneable {
     private boolean ignoreUnsupportedCharset;
     @UriParam(label = "producer,advanced,security", security = "insecure:ssl")
     private boolean useJavaMailSessionPropertiesFromHeaders;
-    @UriParam(defaultValue = "true", label = "producer")
-    private boolean useHeaderRecipients = true;
-    @UriParam(defaultValue = "true", label = "producer")
-    private boolean useHeaderFrom = true;
-    @UriParam(defaultValue = "true", label = "producer")
-    private boolean useHeaderSubject = true;
-    @UriParam(defaultValue = "true", label = "producer")
-    private boolean useHeaderReplyTo = true;
+    @UriParam(label = "producer")
+    private boolean useHeaderRecipients;
+    @UriParam(label = "producer")
+    private boolean useHeaderFrom;
+    @UriParam(label = "producer")
+    private boolean useHeaderSubject;
+    @UriParam(label = "producer")
+    private boolean useHeaderReplyTo;
     @UriParam
     @Metadata(label = "consumer")
     private boolean disconnect;
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
index 85875420a15a..b754f2d96d13 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
@@ -52,7 +52,8 @@ public class AdditionalMailPropertiesTest extends CamelTestSupport {
 
         MockEndpoint mock = getMockEndpoint("mock:result");
 
-        template.sendBodyAndHeader(user.uriPrefix(Protocol.smtp), "Hello james how are you?\r\n", "subject", "Hello");
+        template.sendBodyAndHeader(user.uriPrefix(Protocol.smtp) + "&useHeaderSubject=true", "Hello james how are you?\r\n",
+                "subject", "Hello");
 
         mock.expectedBodiesReceived("Hello james how are you?\r\n");
         mock.expectedHeaderReceived("subject", "Hello");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
index 7618339e1f7e..29739d12d86c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
@@ -59,7 +59,9 @@ public class FromFileSendMailTest extends CamelTestSupport {
                         .setHeader("Subject", constant("Hello World"))
                         .setHeader("To", constant("james@localhost"))
                         .setHeader("From", constant("claus@localhost"))
-                        .to(james.uriPrefix(Protocol.smtp) + "&initialDelay=100&delay=100", "mock:result");
+                        .to(james.uriPrefix(Protocol.smtp)
+                            + "&initialDelay=100&delay=100&useHeaderRecipients=true&useHeaderFrom=true&useHeaderSubject=true",
+                                "mock:result");
             }
         };
     }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
index bc8462aaa882..ccbb868a0b6f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
@@ -78,11 +78,12 @@ public class MailComponentRecipientSetTest extends CamelTestSupport {
                 MailComponent mail = context.getComponent("smtp", MailComponent.class);
                 mail.setConfiguration(config);
 
-                from("direct:a").to(james.uriPrefix(Protocol.smtp) + "&to=a@localhost");
+                from("direct:a").to(james.uriPrefix(Protocol.smtp) + "&to=a@localhost&useHeaderSubject=true");
 
-                from("direct:b").to(james.uriPrefix(Protocol.smtp) + "&to=b@localhost&from=you@you.com");
+                from("direct:b").to(james.uriPrefix(Protocol.smtp) + "&to=b@localhost&from=you@you.com&useHeaderSubject=true");
 
-                from("direct:c").to(admin.uriPrefix(Protocol.smtp) + "&to=c@localhost&cc=you@you.com,them@them.com");
+                from("direct:c").to(
+                        admin.uriPrefix(Protocol.smtp) + "&to=c@localhost&cc=you@you.com,them@them.com&useHeaderSubject=true");
             }
         };
     }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
index e3fa9d08ba92..7feba475c163 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
@@ -48,7 +48,7 @@ public class MailHeaderOverrulePreConfigurationRecipientsTest extends CamelTestS
         headers.put("to", claus.getEmail());
         headers.put("cc", willem.getEmail());
 
-        template.sendBodyAndHeaders(claus.uriPrefix(Protocol.smtp), "Hello World", headers);
+        template.sendBodyAndHeaders(claus.uriPrefix(Protocol.smtp) + "&useHeaderRecipients=true", "Hello World", headers);
 
         mock.assertIsSatisfied();
         /* Bcc should be stripped by specs compliant SMTP servers */
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
index 74cb82f2d488..2efcc96c14f0 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
@@ -94,11 +94,13 @@ public class MailMimeDecodeHeadersTest extends CamelTestSupport {
             public void configure() {
                 from("direct:longSubject")
                         .setHeader("subject", constant(longSubject))
-                        .to(plain.uriPrefix(Protocol.smtp), decoded.uriPrefix(Protocol.smtp));
+                        .to(plain.uriPrefix(Protocol.smtp) + "&useHeaderSubject=true",
+                                decoded.uriPrefix(Protocol.smtp) + "&useHeaderSubject=true");
 
                 from("direct:nonAsciiSubject")
                         .setHeader("subject", constant(nonAsciiSubject))
-                        .to(plain.uriPrefix(Protocol.smtp), decoded.uriPrefix(Protocol.smtp));
+                        .to(plain.uriPrefix(Protocol.smtp) + "&useHeaderSubject=true",
+                                decoded.uriPrefix(Protocol.smtp) + "&useHeaderSubject=true");
 
                 from(plain.uriPrefix(Protocol.pop3) + "&initialDelay=100&delay=100")
                         .to("mock:plain");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
index 8280980d2f21..62352c6c6f5c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
@@ -50,7 +50,7 @@ public class MailMultipleRecipientsTest extends CamelTestSupport {
         assertMailbox("hadrian");
         assertMailbox("tracy");
 
-        template.sendBodyAndHeaders(claus.uriPrefix(Protocol.smtp), "Hello World", headers);
+        template.sendBodyAndHeaders(claus.uriPrefix(Protocol.smtp) + "&useHeaderRecipients=true", "Hello World", headers);
         // END SNIPPET: e1
 
         MockEndpoint.assertIsSatisfied(context);
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
index 0add73b6541d..001a6808c00e 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
@@ -48,7 +48,9 @@ public class MailMultipleRecipientsUsingHeadersTest extends CamelTestSupport {
         map.put("Subject", "Camel rocks");
 
         String body = "Hello Riders.\nYes it does.\n\nRegards James.";
-        template.sendBodyAndHeaders(claus.uriPrefix(Protocol.smtp), body, map);
+        template.sendBodyAndHeaders(
+                claus.uriPrefix(Protocol.smtp) + "&useHeaderRecipients=true&useHeaderFrom=true&useHeaderSubject=true",
+                body, map);
         // END SNIPPET: e1
 
         Mailbox box = claus.getInbox();
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
index 1195cdf79bbe..1872f80ae578 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
@@ -42,7 +42,8 @@ public class MailNameAndEmailInRecipientTest extends CamelTestSupport {
         assertMailbox("davsclaus");
         assertMailbox("jstrachan");
 
-        template.sendBodyAndHeaders(davsclaus.uriPrefix(Protocol.smtp), "Hello World", headers);
+        template.sendBodyAndHeaders(davsclaus.uriPrefix(Protocol.smtp) + "&useHeaderRecipients=true", "Hello World",
+                headers);
         // END SNIPPET: e1
 
         MockEndpoint.assertIsSatisfied(context);
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
index 97ee71538fb1..e4dc7b99c049 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
@@ -98,7 +98,7 @@ public class MailProducerConcurrentTest extends CamelTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() {
-                from("direct:start").to(camel.uriPrefix(Protocol.smtp), "mock:result");
+                from("direct:start").to(camel.uriPrefix(Protocol.smtp) + "&useHeaderRecipients=true", "mock:result");
             }
         };
     }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
index 7e02d6b5f36d..4d4121a162f4 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
@@ -86,7 +86,7 @@ public class MailProducerTest extends CamelTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() {
-                from("direct:start").to(camel.uriPrefix(Protocol.smtp), "mock:result");
+                from("direct:start").to(camel.uriPrefix(Protocol.smtp) + "&useHeaderRecipients=true", "mock:result");
             }
         };
     }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
index b580430c397a..05d9f7105254 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
@@ -157,7 +157,8 @@ public class MailRecipientsTest extends CamelTestSupport {
                 from("direct:b").removeHeaders("*")
                         .to(you.uriPrefix(Protocol.smtp) + "&from=" + you.getEmail() + recipients);
                 from("direct:c").removeHeaders("cc")
-                        .to(you.uriPrefix(Protocol.smtp) + "&from=" + you.getEmail() + recipients);
+                        .to(you.uriPrefix(Protocol.smtp) + "&from=" + you.getEmail() + recipients
+                            + "&useHeaderRecipients=true");
                 // END SNIPPET: e1
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
index ae0d4fbb61e3..8a70a04d2520 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
@@ -82,7 +82,7 @@ public class MailReplyToTest extends CamelTestSupport {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:a")
-                        .to(christian.uriPrefix(Protocol.smtp) + "&subject=Camel");
+                        .to(christian.uriPrefix(Protocol.smtp) + "&subject=Camel&useHeaderReplyTo=true");
 
                 from("direct:b")
                         .to(christian.uriPrefix(Protocol.smtp)
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
index 00c6be14b8c8..7f183ff8f697 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
@@ -54,7 +54,7 @@ public class MailRouteTest extends CamelTestSupport {
 
         Map<String, Object> headers = new HashMap<>();
         headers.put(MailConstants.MAIL_REPLY_TO, "route-test-reply@localhost");
-        template.sendBodyAndHeaders(james.uriPrefix(Protocol.smtp), "hello world!", headers);
+        template.sendBodyAndHeaders(james.uriPrefix(Protocol.smtp) + "&useHeaderReplyTo=true", "hello world!", headers);
 
         // lets test the first sent worked
         assertMailboxReceivedMessages(james);
@@ -131,7 +131,8 @@ public class MailRouteTest extends CamelTestSupport {
                 // to seperate the mail addresses
                 from("direct:a")
                         .setHeader("to", constant("result@localhost; copy@localhost"))
-                        .to(result.uriPrefix(Protocol.smtp));
+                        .to(result.uriPrefix(Protocol.smtp)
+                            + "&useHeaderRecipients=true&useHeaderReplyTo=true&useHeaderSubject=true");
 
                 from(result.uriPrefix(Protocol.imap) + "&initialDelay=100&delay=100").convertBodyTo(String.class)
                         .to("mock:result");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
index 261fcec88832..c807cadcee4f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
@@ -56,7 +56,8 @@ public class MailSubjectTest extends CamelTestSupport {
         return new RouteBuilder() {
             public void configure() {
                 // START SNIPPET: e1
-                from("direct:a").setHeader("subject", constant(subject)).to(james2.uriPrefix(Protocol.smtp));
+                from("direct:a").setHeader("subject", constant(subject))
+                        .to(james2.uriPrefix(Protocol.smtp) + "&useHeaderSubject=true");
                 // END SNIPPET: e1
 
                 from(james2.uriPrefix(Protocol.imap) + "&initialDelay=100&delay=100").to("mock:result");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
index 9b33a2594641..9a6e9dc0e9ac 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
@@ -69,13 +69,15 @@ public class MailToMultipleEndpointsTest extends CamelTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() {
-                from("direct:a").to(james2.uriPrefix(Protocol.smtp) + "&to=" + a.getEmail() + "&from=me@me.com");
+                from("direct:a")
+                        .to(james2.uriPrefix(Protocol.smtp) + "&to=" + a.getEmail() + "&from=me@me.com&useHeaderSubject=true");
 
-                from("direct:b").to(james.uriPrefix(Protocol.smtp) + "&to=" + b.getEmail() + "&from=you@you.com");
+                from("direct:b")
+                        .to(james.uriPrefix(Protocol.smtp) + "&to=" + b.getEmail() + "&from=you@you.com&useHeaderSubject=true");
 
                 from("direct:c").to(
                         admin.uriPrefix(Protocol.smtp) + "&to=" + c.getEmail()
-                                    + "&from=me@me.com&cc=you@you.com,them@them.com");
+                                    + "&from=me@me.com&cc=you@you.com,them@them.com&useHeaderSubject=true");
             }
         };
     }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
index 0d9a2ea22b6d..b93ecfd2572a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
@@ -49,7 +49,9 @@ public class MailUsingHeadersTest extends CamelTestSupport {
         map.put("CamelTest", "value");
 
         String body = "Hello Claus.\nYes it does.\n\nRegards James.";
-        template.sendBodyAndHeaders(davsclaus.uriPrefix(Protocol.smtp), body, map);
+        template.sendBodyAndHeaders(
+                davsclaus.uriPrefix(Protocol.smtp) + "&useHeaderRecipients=true&useHeaderFrom=true&useHeaderSubject=true",
+                body, map);
         // END SNIPPET: e1
 
         Mailbox box = davsclaus.getInbox();
@@ -71,8 +73,9 @@ public class MailUsingHeadersTest extends CamelTestSupport {
 
         String body = "Hello Claus.\nYes it does.\n\nRegards James.";
         template.sendBodyAndHeaders(
-                davsclaus.uriPrefix(Protocol.smtp) + "&from=James Strachan <js...@apache.org>&to=davsclaus@localhost", body,
-                map);
+                davsclaus.uriPrefix(Protocol.smtp)
+                                    + "&from=James Strachan <js...@apache.org>&to=davsclaus@localhost&useHeaderSubject=true",
+                body, map);
 
         Mailbox box = davsclaus.getInbox();
         Message msg = box.get(0);
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
index 9b98109cd99d..17b303b185d8 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java
@@ -57,7 +57,7 @@ public class MailUsingOwnComponentTest extends CamelTestSupport {
     public void testUsingOwnMailComponent() throws Exception {
         Mailbox.clearAll();
 
-        template.sendBodyAndHeader("mailbox:localhost", "Hello Mailbox", "to", davsclaus.getEmail());
+        template.sendBodyAndHeader("mailbox:localhost?useHeaderRecipients=true", "Hello Mailbox", "to", davsclaus.getEmail());
 
         Mailbox box = davsclaus.getInbox();
         Message msg = box.get(0);
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
index a986224d1f6f..fa71a0f435e8 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
@@ -78,8 +78,9 @@ public class RawMailMessageTest extends CamelTestSupport {
 
         getMockEndpoint("mock:mail").expectedMessageCount(1);
         template.sendBodyAndHeaders(
-                "smtp://davsclaus@localhost:" + Mailbox.getPort(Protocol.smtp) + "?password=" + davsclaus.getPassword(), body,
-                map);
+                "smtp://davsclaus@localhost:" + Mailbox.getPort(Protocol.smtp) + "?password=" + davsclaus.getPassword()
+                                    + "&useHeaderRecipients=true&useHeaderFrom=true&useHeaderSubject=true",
+                body, map);
         MockEndpoint.assertIsSatisfied(context);
 
         Exchange exchange = getMockEndpoint("mock:mail").getReceivedExchanges().get(0);
diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
index 685912cba669..d737759d820c 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_21.adoc
@@ -2027,7 +2027,20 @@ The following options have been added to the mail endpoint:
 * `useHeaderSubject`
 * `useHeaderReplyTo`
 
-These options default to `true` to maintain backward compatibility. Users who wish to prevent exchange headers from overriding pre-configured endpoint URI values can now set these to `false` to secure their routes against unintended header injection.
+These options default to `false` (secure by default) to prevent untrusted exchange headers
+from overriding pre-configured endpoint URI values. This follows the same secure-by-default
+pattern as `useJavaMailSessionPropertiesFromHeaders` (also default `false`).
+
+Routes that intentionally set mail headers (e.g. via `.setHeader("To", ...)`) should add the
+corresponding option to the endpoint URI or set it globally via component-level properties:
+
+[source,properties]
+----
+camel.component.smtp.useHeaderRecipients=true
+camel.component.smtp.useHeaderFrom=true
+camel.component.smtp.useHeaderSubject=true
+camel.component.smtp.useHeaderReplyTo=true
+----
 
 === camel-milo - potential breaking change
 
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapComponentBuilderFactory.java
index cc5aa93835c3..c2065ce5c343 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapComponentBuilderFactory.java
@@ -542,7 +542,7 @@ public interface ImapComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderFrom the value to set
@@ -562,7 +562,7 @@ public interface ImapComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderRecipients the value to set
@@ -581,7 +581,7 @@ public interface ImapComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderReplyTo the value to set
@@ -600,7 +600,7 @@ public interface ImapComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderSubject the value to set
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapsComponentBuilderFactory.java
index 844f717fdddf..0ba6ea582f49 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapsComponentBuilderFactory.java
@@ -542,7 +542,7 @@ public interface ImapsComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderFrom the value to set
@@ -562,7 +562,7 @@ public interface ImapsComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderRecipients the value to set
@@ -581,7 +581,7 @@ public interface ImapsComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderReplyTo the value to set
@@ -600,7 +600,7 @@ public interface ImapsComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderSubject the value to set
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3ComponentBuilderFactory.java
index b42a7649b6c6..8eac59183ff1 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3ComponentBuilderFactory.java
@@ -542,7 +542,7 @@ public interface Pop3ComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderFrom the value to set
@@ -562,7 +562,7 @@ public interface Pop3ComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderRecipients the value to set
@@ -581,7 +581,7 @@ public interface Pop3ComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderReplyTo the value to set
@@ -600,7 +600,7 @@ public interface Pop3ComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderSubject the value to set
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3sComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3sComponentBuilderFactory.java
index a7beb05bdbb6..f65437957cd9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3sComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3sComponentBuilderFactory.java
@@ -542,7 +542,7 @@ public interface Pop3sComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderFrom the value to set
@@ -562,7 +562,7 @@ public interface Pop3sComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderRecipients the value to set
@@ -581,7 +581,7 @@ public interface Pop3sComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderReplyTo the value to set
@@ -600,7 +600,7 @@ public interface Pop3sComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderSubject the value to set
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpComponentBuilderFactory.java
index eb15c73fbb83..273b7796fe68 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpComponentBuilderFactory.java
@@ -542,7 +542,7 @@ public interface SmtpComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderFrom the value to set
@@ -562,7 +562,7 @@ public interface SmtpComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderRecipients the value to set
@@ -581,7 +581,7 @@ public interface SmtpComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderReplyTo the value to set
@@ -600,7 +600,7 @@ public interface SmtpComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderSubject the value to set
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpsComponentBuilderFactory.java
index e82bb8dcb7c8..097fbff73582 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpsComponentBuilderFactory.java
@@ -542,7 +542,7 @@ public interface SmtpsComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderFrom the value to set
@@ -562,7 +562,7 @@ public interface SmtpsComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderRecipients the value to set
@@ -581,7 +581,7 @@ public interface SmtpsComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderReplyTo the value to set
@@ -600,7 +600,7 @@ public interface SmtpsComponentBuilderFactory {
          * 
          * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderSubject the value to set
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
index 73d7d05e4b2d..db4275f06fd7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
@@ -2111,7 +2111,7 @@ public interface MailEndpointBuilderFactory {
          * 
          * The option is a: <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderFrom the value to set
@@ -2129,7 +2129,7 @@ public interface MailEndpointBuilderFactory {
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderFrom the value to set
@@ -2147,7 +2147,7 @@ public interface MailEndpointBuilderFactory {
          * 
          * The option is a: <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderRecipients the value to set
@@ -2165,7 +2165,7 @@ public interface MailEndpointBuilderFactory {
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderRecipients the value to set
@@ -2182,7 +2182,7 @@ public interface MailEndpointBuilderFactory {
          * 
          * The option is a: <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderReplyTo the value to set
@@ -2199,7 +2199,7 @@ public interface MailEndpointBuilderFactory {
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderReplyTo the value to set
@@ -2216,7 +2216,7 @@ public interface MailEndpointBuilderFactory {
          * 
          * The option is a: <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderSubject the value to set
@@ -2233,7 +2233,7 @@ public interface MailEndpointBuilderFactory {
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: producer
          * 
          * @param useHeaderSubject the value to set