diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsOptions.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsOptions.kt
index 2004e98..b982636 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsOptions.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsOptions.kt
@@ -12,12 +12,12 @@ open class FetchEmailsOptions(
      */
     val lastRetrievedMessageId: Long? = null,
 
-    val downloadMessageBody: Boolean = false,
+    val downloadMessageBody: Boolean = true,
     /**
      * If set to true and message contains a plain text message body, then only the plain text message body is downloaded
      * and the HTML message body ignored / not downloaded. Reduces process time about 50 % (if no attachments get downloaded).
      */
-    val downloadOnlyPlainTextOrHtmlMessageBody: Boolean = false,
+    val downloadOnlyPlainTextOrHtmlMessageBody: Boolean = true,
     val downloadOnlyMessagesNewerThan: LocalDate? = null,
 
     /**
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/ListenForNewMailsOptions.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/ListenForNewMailsOptions.kt
index 66b26bc..5ae598a 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/ListenForNewMailsOptions.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/ListenForNewMailsOptions.kt
@@ -7,8 +7,8 @@ import java.util.concurrent.atomic.AtomicBoolean
 open class ListenForNewMailsOptions(
     val stopListening: AtomicBoolean = AtomicBoolean(false),
 
-    downloadMessageBody: Boolean = false,
-    downloadOnlyPlainTextOrHtmlMessageBody: Boolean = false,
+    downloadMessageBody: Boolean = true,
+    downloadOnlyPlainTextOrHtmlMessageBody: Boolean = true,
 
     downloadAttachmentsWithExtensions: List<String> = DefaultDownloadedAttachmentsWithExtensions,
     attachmentsDownloadDirectory: File = DefaultAttachmentsDownloadDirectory,