Update release.yml

2026-08-31 01:52:30 +00:00 · 2026-05-26 20:11:49 +08:00 · 2026-05-26 20:07:40 +08:00 · 2026-05-26 20:02:55 +08:00 · 2026-05-26 19:42:26 +08:00 · 2026-05-26 15:27:34 +08:00
82 changed files with 3456 additions and 1013 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 /target
 .vscode
 .idea
-config.toml
+config.toml
+node_modules
+dedup_report.txt
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -293,7 +293,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

 [[package]]
 name = "bichon-admin"
-version = "1.1.3"
+version = "1.4.0"
 dependencies = [
 "bichon-core",
 "console",
@@ -301,7 +301,6 @@ dependencies = [
 "indicatif",
 "itertools",
 "memdb",
- "mimalloc",
 "native_db",
 "native_model",
 "serde",
@@ -312,7 +311,7 @@ dependencies = [

 [[package]]
 name = "bichon-cli"
-version = "1.1.3"
+version = "1.4.0"
 dependencies = [
 "base64 0.22.1",
 "bichon-core",
@@ -338,7 +337,7 @@ dependencies = [

 [[package]]
 name = "bichon-core"
-version = "1.1.3"
+version = "1.4.0"
 dependencies = [
 "async-imap",
 "base64 0.22.1",
@@ -346,6 +345,7 @@ dependencies = [
 "bytes 1.11.1",
 "chrono",
 "clap",
+ "cron",
 "dashmap",
 "deunicode",
 "email_address",
@@ -396,7 +396,7 @@ dependencies = [

 [[package]]
 name = "bichon-server"
-version = "1.1.3"
+version = "1.4.0"
 dependencies = [
 "bichon-core",
 "bichon-smtp",
@@ -404,7 +404,6 @@ dependencies = [
 "email_address",
 "governor",
 "http",
- "mimalloc",
 "poem",
 "poem-derive",
 "poem-openapi",
@@ -421,7 +420,7 @@ dependencies = [

 [[package]]
 name = "bichon-smtp"
-version = "1.1.3"
+version = "1.4.0"
 dependencies = [
 "base64 0.22.1",
 "bichon-core",
@@ -875,6 +874,17 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"

+[[package]]
+name = "cron"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5877d3fbf742507b66bc2a1945106bd30dd8504019d596901ddd012a4dd01740"
+dependencies = [
+ "chrono",
+ "once_cell",
+ "winnow 0.6.26",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.15"
@@ -1006,9 +1016,9 @@ dependencies = [

 [[package]]
 name = "dashmap"
-version = "6.1.0"
+version = "6.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c"
 dependencies = [
 "cfg-if",
 "crossbeam-utils",
@@ -1779,9 +1789,9 @@ checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"

 [[package]]
 name = "http"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
+checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0"
 dependencies = [
 "bytes 1.11.1",
 "itoa",
@@ -2252,15 +2262,6 @@ version = "0.2.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"

-[[package]]
-name = "libmimalloc-sys"
-version = "0.1.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d1eacfa31c33ec25e873c136ba5669f00f9866d0688bea7be4d3f7e43067df6"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.12.1"
@@ -2465,15 +2466,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "mimalloc"
-version = "0.1.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3627c4272df786b9260cabaa46aec1d59c93ede723d4c3ef646c503816b0640"
-dependencies = [
- "libmimalloc-sys",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -3931,9 +3923,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.149"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
 "itoa",
 "memchr",
@@ -4286,9 +4278,9 @@ dependencies = [

 [[package]]
 name = "sysinfo"
-version = "0.39.1"
+version = "0.39.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4deba334e1190ba7cb498327affa11e5ece10d26a30ab2f27fcf09504b8d8b6"
+checksum = "14311e7e9a03114cd4b65eedd54e8fed2945e17f08586ae97ef53bc0669f9581"
 dependencies = [
 "libc",
 "memchr",
@@ -5611,6 +5603,15 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"

+[[package]]
+name = "winnow"
+version = "0.6.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winnow"
 version = "0.7.15"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,23 +6,23 @@ members = [
    "crates/server",
    "crates/cli",
    "crates/admin",
+    "crates/smtp",
 ]

 resolver = "2"

 [workspace.package]
-version = "1.1.3"
+version = "1.4.0"
 edition = "2021"

 [workspace.dependencies]
 chrono = "0.4.44"
 clap = { version = "4.6.1", features = ["derive", "env"] }
-mimalloc = "0.1.50"
 memdb = { path = "crates/memdb" }
 itertools = "0.14.0"
 ring = { version = "0.17.14", features = ["std"] }
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
+serde_json = "1.0.150"
 tokio = { version = "1.52.3", features = ["full"] }
 tracing = "0.1.44"
 tracing-appender = "0.2.3"
@@ -38,7 +38,7 @@ reqwest = { version = "0.12.24", default-features = false, features = [
    "socks",
 ] }
 tokio-socks = "0.5.2"
-http = "1.4.0"
+http = "1.4.1"
 regex = "1.12.3"
 email_address = "0.2.9"
 futures = "0.3.32"
@@ -52,7 +52,7 @@ tokio-rustls = { version = "0.26.4", default-features = false, features = [
 timeago = "0.6.0"
 oauth2 = { version = "5.0.0", features = ["reqwest-blocking"] }
 url = { version = "2.5.8", features = ["serde"] }
-sysinfo = "0.39.1"
+sysinfo = "0.39.2"
 num_cpus = "1.17.0"
 rand = "0.10.1"
 encoding_rs = "0.8.35"
@@ -73,7 +73,7 @@ time = { version = "0.3.47", features = [
 rust-embed = "8.11.0"
 murmur3 = "0.5.2"
 urlencoding = "2.1.3"
-dashmap = "6.1.0"
+dashmap = "6.2.1"
 gethostname = "1.1.0"
 itoa = "1.0.18"
 html2text = "0.17.1"
--- a/README.md
+++ b/README.md
@@ -106,6 +106,10 @@
 - **Admin Tooling**: Password reset for locked-out admins. Non-destructive v0.3.7 to v1.0 data migration.
 - **API Token Management**: Create, list, and revoke long-lived API tokens for programmatic access.
 - **SOCKS5 Proxy Management**: Configure and manage proxy profiles for routing IMAP traffic per account.
+- **Scheduled Download**: Configure per-account download schedules using cron expressions. Run syncs at specific times or intervals — for example, nightly-only or business-hours-only archiving.
+- **Remote Content Blocking**: External images and tracking pixels embedded in emails are blocked by default. Users can selectively allow remote content to load on a per-message basis from the WebUI.
+- **Async Index Deduplication**: Duplicate detection in the search index is performed asynchronously, reducing write latency during high-throughput ingestion.
+

 ## Quick Start

@@ -580,8 +584,8 @@ No. Bichon is an **archiver**, not an email client. The optional SMTP server **r

 ### What hardware does Bichon need?

- **Minimal:** 1 CPU core, 512 MB RAM
- **Recommended (100+ accounts, 200+ GB):** 4+ cores, 2+ GB RAM
+- **Recommended:** 4+ CPU cores, 2+ GB RAM (sufficient for 10+ accounts and 200+ GB of archived data)
+- Filesystem: use a mainstream Linux filesystem such as **ext4** or **XFS**; avoid network / virtual filesystems (NFS, VirtIO-FS) for all data directories
 - Indices benefit from SSD storage; blob storage can use HDD

 ### How do I reset the admin password?
@@ -652,7 +656,6 @@ Feel free to open an [Issue](https://github.com/rustmailer/bichon/issues) or joi
 | **Frontend** | React 18, TypeScript, Vite 6, ShadCN UI, TanStack Router/Query/Table |
 | **Charts** | Recharts |
 | **i18n** | i18next (18 languages) |
-| **Allocator** | mimalloc |
 | **Container** | Ubuntu 24.04, Docker |

 ## License
--- a/crates/admin/Cargo.toml
+++ b/crates/admin/Cargo.toml
@@ -17,5 +17,4 @@ serde_json.workspace = true

 itertools.workspace = true
 snafu.workspace = true
-memdb.workspace = true
-mimalloc = "0.1.50"
+memdb.workspace = true
--- a/crates/admin/src/main.rs
+++ b/crates/admin/src/main.rs
@@ -18,7 +18,6 @@

 use console::style;
 use dialoguer::{theme::ColorfulTheme, Select};
-use mimalloc::MiMalloc;

 use crate::{migrate::handle_migration, reset::handle_reset_password};

@@ -26,8 +25,6 @@ pub mod meta;
 pub mod migrate;
 pub mod reset;

-#[global_allocator]
-static GLOBAL: MiMalloc = MiMalloc;

 fn main() {
    run_interactive();
@@ -43,7 +40,7 @@ async fn run_interactive() {

    let main_options = vec![
        "Reset Admin Password",
-        "Migrate Legacy v0.3.7 Storage to v1.0.x",
+        "Migrate Legacy v0.3.7 Storage to v1.x",
        "Exit",
    ];

--- a/crates/admin/src/meta.rs
+++ b/crates/admin/src/meta.rs
@@ -117,7 +117,6 @@ pub struct AccountV3 {
    pub capabilities: Option<Vec<String>>,
    pub date_since: Option<DateSince>,
    pub date_before: Option<RelativeDate>,
-    pub folder_limit: Option<u32>,
    pub sync_folders: Option<Vec<String>>,
    pub account_type: AccountType,
    pub sync_interval_min: Option<i64>,
@@ -193,7 +192,7 @@ impl From<AccountV3> for AccountV2 {
            name: value.name,
            capabilities: value.capabilities,
            date_since: value.date_since,
-            folder_limit: value.folder_limit,
+            folder_limit: None,
            sync_folders: value.sync_folders,
            account_type: value.account_type,
            sync_interval_min: value.sync_interval_min,
@@ -217,7 +216,6 @@ impl From<AccountV2> for AccountV3 {
            name: value.name,
            capabilities: value.capabilities,
            date_since: value.date_since,
-            folder_limit: value.folder_limit,
            sync_folders: value.sync_folders,
            account_type: value.account_type,
            sync_interval_min: value.sync_interval_min,
@@ -246,7 +244,6 @@ impl From<AccountV3> for AccountModel {
            capabilities: value.capabilities,
            date_since: value.date_since,
            date_before: value.date_before,
-            folder_limit: value.folder_limit,
            download_folders: value.sync_folders,
            account_type: value.account_type,
            download_interval_min: value.sync_interval_min,
@@ -261,6 +258,7 @@ impl From<AccountV3> for AccountModel {
            imap_quota_window: None,
            imap_quota_bytes: None,
            auto_download_new_mailboxes: None,
+            download_schedule: None,
        }
    }
 }
@@ -660,6 +658,7 @@ impl From<MailBox> for bichon_core::cache::imap::mailbox::MailBox {
            unseen: value.unseen,
            uid_next: value.uid_next,
            uid_validity: value.uid_validity,
+            highest_uid: None,
        }
    }
 }
--- a/crates/admin/src/migrate.rs
+++ b/crates/admin/src/migrate.rs
@@ -11,7 +11,7 @@ use indicatif::{ProgressBar, ProgressStyle};
 pub fn handle_migration(theme: &ColorfulTheme) {
    println!(
        "\n{}",
-        style("MIGRATION: Bichon v0.3.7 Storage Architecture → v1.0.x")
+        style("MIGRATION: Bichon v0.3.7 Storage Architecture → v1.x")
            .bold()
            .yellow()
    );
@@ -20,7 +20,7 @@ pub fn handle_migration(theme: &ColorfulTheme) {
        "{}",
        style(
            "This tool migrates data from the legacy v0.3.7 Tantivy-based storage \
-            architecture to the new v1.0.x \
+            architecture to the new v1.x \
            separated index and Fjall-backed storage format."
        )
        .dim()
@@ -32,7 +32,7 @@ pub fn handle_migration(theme: &ColorfulTheme) {
            "Legacy v0.3.7 architecture:\n\
            • envelope metadata stored in Tantivy\n\
            • message data stored in Tantivy\n\n\
-                New v1.0.x architecture:\n\
+                New v1.x architecture:\n\
            • mail indexes stored in Tantivy\n\
            • attachment indexes stored in Tantivy\n\
            • raw message data stored in Fjall\n\
@@ -163,7 +163,7 @@ pub fn handle_migration(theme: &ColorfulTheme) {
    println!("----------------------------------------");

    println!(
-        "\n{} Checking legacy v0.x storage layout...",
+        "\n{} Checking legacy v0.3.7 storage layout...",
        style("⌛").yellow()
    );

@@ -172,7 +172,7 @@ pub fn handle_migration(theme: &ColorfulTheme) {
            println!(
                "{} {}",
                style("✔").green(),
-                style("Legacy v0.3.7 Tantivy-based storage detected. Migration to v1.0 is required.")
+                style("Legacy v0.3.7 Tantivy-based storage detected. Migration to v1.x is required.")
                    .yellow()
            );
        }
@@ -186,7 +186,7 @@ pub fn handle_migration(theme: &ColorfulTheme) {
            println!(
                "{}",
                style(
-                    "The selected directories may already be using the v1.0 storage architecture."
+                    "The selected directories may already be using the v1.x storage architecture."
                )
                .dim()
            );
@@ -288,12 +288,6 @@ pub fn handle_migration(theme: &ColorfulTheme) {
        style(batch_size).cyan().bold()
    );

-    println!(
-        "{} Using batch size: {}\n",
-        style("✓").green(),
-        style(batch_size).cyan().bold()
-    );
-
    let legacy = LegacyDirs::new(index_path.clone(), data_path.clone());
    let total_segments = match count_eml_segments(&legacy) {
        Ok(n) => n,
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -69,5 +69,6 @@ tokio-util.workspace = true
 whichlang = "0.1.1"
 deunicode = "1.6.2"
 scopeguard = "1.2.0"
+cron = "0.15"
 quick-xml = { version = "0.40.0", features = ["serialize"] }
 hickory-resolver = "0.26.0-alpha.1"
--- a/crates/core/src/account/migration.rs
+++ b/crates/core/src/account/migration.rs
@@ -80,7 +80,6 @@ pub struct Account {
    pub capabilities: Option<Vec<String>>,
    pub date_since: Option<DateSince>,
    pub date_before: Option<RelativeDate>,
-    pub folder_limit: Option<u32>,
    pub download_folders: Option<Vec<String>>,
    pub account_type: AccountType,
    pub download_interval_min: Option<i64>,
@@ -95,6 +94,7 @@ pub struct Account {
    pub imap_quota_bytes: Option<u64>,
    pub imap_quota_window: Option<QuotaWindow>,
    pub auto_download_new_mailboxes: Option<bool>,
+    pub download_schedule: Option<String>,
 }

 impl MemDbModel for Account {
@@ -124,7 +124,6 @@ impl Account {
            created_at: utc_now!(),
            updated_at: utc_now!(),
            use_proxy: request.use_proxy,
-            folder_limit: request.folder_limit,
            use_dangerous: request.use_dangerous,
            pgp_key: request.pgp_key,
            created_by: user_id,
@@ -133,6 +132,7 @@ impl Account {
            auto_download_new_mailboxes: request.auto_download_new_mailboxes,
            imap_quota_bytes: request.imap_quota_bytes,
            imap_quota_window: request.imap_quota_window,
+            download_schedule: request.download_schedule,
        })
    }

@@ -365,20 +365,10 @@ impl Account {
            }
        }

-        if let Some(folder_limit) = request.folder_limit {
-            new.folder_limit = Some(folder_limit);
-        }
-
        if let Some(account_name) = request.account_name {
            new.account_name = Some(account_name);
        }

-        if let Some(clear_folder_limit) = request.clear_folder_limit {
-            if clear_folder_limit {
-                new.folder_limit = None;
-            }
-        }
-
        if matches!(old.account_type, AccountType::IMAP) {
            if let Some(imap) = &request.imap {
                if let Some(current_imap) = &mut new.imap {
@@ -439,6 +429,12 @@ impl Account {
        if let Some(auto_download_new_mailboxes) = request.auto_download_new_mailboxes {
            new.auto_download_new_mailboxes = Some(auto_download_new_mailboxes);
        }
+        if let Some(download_schedule) = request.download_schedule {
+            new.download_schedule = Some(download_schedule);
+        }
+        if request.clear_download_schedule == Some(true) {
+            new.download_schedule = None;
+        }
        new.updated_at = utc_now!();
        Ok(new)
    }
--- a/crates/core/src/account/payload.rs
+++ b/crates/core/src/account/payload.rs
@@ -16,6 +16,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.

+use std::str::FromStr;
+
 use crate::account::entity::ImapConfig;
 use crate::account::migration::{AccountModel, AccountType, QuotaWindow};
 use crate::account::since::{DateSince, RelativeDate};
@@ -39,8 +41,6 @@ pub struct AccountCreateRequest {
    pub date_since: Option<DateSince>,
    pub date_before: Option<RelativeDate>,
    pub account_type: AccountType,
-    #[cfg_attr(feature = "web-api", oai(validator(minimum(value = "100"))))]
-    pub folder_limit: Option<u32>,
    #[cfg_attr(feature = "web-api", oai(validator(minimum(value = "10"))))]
    pub download_interval_min: Option<i64>,
    #[cfg_attr(
@@ -54,6 +54,7 @@ pub struct AccountCreateRequest {
    pub imap_quota_bytes: Option<u64>,
    pub imap_quota_window: Option<QuotaWindow>,
    pub auto_download_new_mailboxes: Option<bool>,
+    pub download_schedule: Option<String>,
 }

 impl AccountCreateRequest {
@@ -92,12 +93,15 @@ impl AccountCreateRequest {
                        ))
                    }
                }
-                if self.download_interval_min.is_none() {
+                if self.download_interval_min.is_none() && self.download_schedule.is_none() {
                    return Err(raise_error!(
-                        "`sync_interval_min` is required for IMAP account type".into(),
+                        "`sync_interval_min` or `download_schedule` is required for IMAP account type".into(),
                        ErrorCode::InvalidParameter
                    ));
                }
+                if let Some(ref schedule) = self.download_schedule {
+                    validate_cron_expression(schedule)?;
+                }
            }
            AccountType::NoSync => {}
        }
@@ -139,12 +143,6 @@ pub struct AccountUpdateRequest {
    pub date_since: Option<DateSince>,
    pub date_before: Option<RelativeDate>,
    pub clear_date_range: Option<bool>,
-    /// Max emails to sync for this folder.  
-    /// If not set, sync all emails.  
-    /// otherwise sync up to `n` most recent emails (min 10).
-    #[cfg_attr(feature = "web-api", oai(validator(minimum(value = "100"))))]
-    pub folder_limit: Option<u32>,
-    pub clear_folder_limit: Option<bool>,
    /// Configuration for selective folder (mailbox/label) synchronization
    ///
    /// - For IMAP/SMTP accounts:
@@ -178,6 +176,8 @@ pub struct AccountUpdateRequest {
    pub imap_quota_bytes: Option<u64>,
    pub imap_quota_window: Option<QuotaWindow>,
    pub auto_download_new_mailboxes: Option<bool>,
+    pub download_schedule: Option<String>,
+    pub clear_download_schedule: Option<bool>,
 }

 impl AccountUpdateRequest {
@@ -197,13 +197,6 @@ impl AccountUpdateRequest {
            ));
        }

-        if self.clear_folder_limit == Some(true) && self.folder_limit.is_some() {
-            return Err(raise_error!(
-                "clear_folder_limit cannot be combined with folder_limit".into(),
-                ErrorCode::InvalidParameter
-            ));
-        }
-
        if self.clear_date_range == Some(true)
            && (self.date_since.is_some() || self.date_before.is_some())
        {
@@ -230,11 +223,36 @@ impl AccountUpdateRequest {
                ));
                }
            }
+            if self.clear_download_schedule == Some(true) && self.download_schedule.is_some() {
+                return Err(raise_error!(
+                    "clear_download_schedule cannot be combined with download_schedule".into(),
+                    ErrorCode::InvalidParameter
+                ));
+            }
+            if let Some(ref schedule) = self.download_schedule {
+                validate_cron_expression(schedule)?;
+            }
        }
        Ok(())
    }
 }

+fn validate_cron_expression(expr: &str) -> BichonResult<()> {
+    if expr.trim().is_empty() {
+        return Err(raise_error!(
+            "download_schedule must not be empty".into(),
+            ErrorCode::InvalidParameter
+        ));
+    }
+    cron::Schedule::from_str(expr).map_err(|e| {
+        raise_error!(
+            format!("Invalid cron expression '{}': {}", expr, e),
+            ErrorCode::InvalidParameter
+        )
+    })?;
+    Ok(())
+}
+
 #[derive(Clone, Debug, Default, Eq, PartialEq, Deserialize, Serialize)]
 #[cfg_attr(feature = "web-api", derive(poem_openapi::Object))]

@@ -253,3 +271,34 @@ pub fn filter_accessible_accounts<'a>(
        .cloned()
        .collect()
 }
+
+#[cfg(test)]
+mod test {
+    use super::validate_cron_expression;
+
+    #[test]
+    fn valid_cron_expressions() {
+        assert!(validate_cron_expression("0 0 0 * * *").is_ok()); // daily at midnight
+        assert!(validate_cron_expression("0 */5 * * * *").is_ok()); // every 5 minutes
+        assert!(validate_cron_expression("0 0 12 * * 1-5").is_ok()); // weekdays at noon
+        assert!(validate_cron_expression("0 30 4 1 * *").is_ok()); // 1st of month at 04:30
+        assert!(validate_cron_expression("0 0 * * * *").is_ok()); // every hour
+    }
+
+    #[test]
+    fn invalid_cron_expression_too_few_fields() {
+        assert!(validate_cron_expression("0 0 * *").is_err());
+        assert!(validate_cron_expression("* * * * *").is_err()); // 5 fields, needs seconds
+    }
+
+    #[test]
+    fn invalid_cron_expression_empty() {
+        assert!(validate_cron_expression("").is_err());
+        assert!(validate_cron_expression("   ").is_err());
+    }
+
+    #[test]
+    fn invalid_cron_expression_garbage() {
+        assert!(validate_cron_expression("not a cron").is_err());
+    }
+}
--- a/crates/core/src/account/since.rs
+++ b/crates/core/src/account/since.rs
@@ -364,4 +364,43 @@ mod test {
        };
        assert!(e.validate().is_err());
    }
+
+    // ── Sliding window tests ──────────────────────────────────────
+
+    #[test]
+    fn relative_date_calculate_returns_valid_format() {
+        let r = RelativeDate {
+            unit: Unit::Years,
+            value: 1,
+        };
+        let date_str = r.calculate_date().unwrap();
+        // Expect format like "26-May-2025"
+        assert!(date_str.len() > 5);
+        assert!(date_str.contains('-'));
+    }
+
+    #[test]
+    fn relative_date_one_year_ago_is_before_now() {
+        let r = RelativeDate {
+            unit: Unit::Years,
+            value: 1,
+        };
+        let date_str = r.calculate_date().unwrap();
+        let parsed = chrono::NaiveDate::parse_from_str(&date_str, "%d-%b-%Y").unwrap();
+        let today = chrono::Local::now().date_naive();
+        assert!(parsed < today, "1 year ago ({parsed}) should be before today ({today})");
+    }
+
+    #[test]
+    fn relative_date_one_day_ago_is_yesterday() {
+        let r = RelativeDate {
+            unit: Unit::Days,
+            value: 1,
+        };
+        let date_str = r.calculate_date().unwrap();
+        let parsed = chrono::NaiveDate::parse_from_str(&date_str, "%d-%b-%Y").unwrap();
+        let today = chrono::Local::now().date_naive();
+        let yesterday = today - chrono::Duration::days(1);
+        assert_eq!(parsed, yesterday, "1 day ago should be yesterday");
+    }
 }
--- a/crates/core/src/account/view.rs
+++ b/crates/core/src/account/view.rs
@@ -40,7 +40,6 @@ pub struct AccountResp {
    pub capabilities: Option<Vec<String>>,
    pub date_since: Option<DateSince>,
    pub date_before: Option<RelativeDate>,
-    pub folder_limit: Option<u32>,
    pub download_folders: Option<Vec<String>>,
    pub account_type: AccountType,
    pub download_interval_min: Option<i64>,
@@ -57,6 +56,7 @@ pub struct AccountResp {
    pub imap_quota_bytes: Option<u64>,
    pub imap_quota_window: Option<QuotaWindow>,
    pub auto_download_new_mailboxes: Option<bool>,
+    pub download_schedule: Option<String>,
 }

 impl AccountResp {
@@ -72,7 +72,6 @@ impl AccountResp {
            capabilities: account.capabilities,
            date_since: account.date_since,
            date_before: account.date_before,
-            folder_limit: account.folder_limit,
            download_folders: account.download_folders,
            account_type: account.account_type,
            download_interval_min: account.download_interval_min,
@@ -93,6 +92,7 @@ impl AccountResp {
            imap_quota_bytes: account.imap_quota_bytes,
            imap_quota_window: account.imap_quota_window,
            auto_download_new_mailboxes: account.auto_download_new_mailboxes,
+            download_schedule: account.download_schedule,
        }
    }
 }
--- a/crates/core/src/autoconfig/client.rs
+++ b/crates/core/src/autoconfig/client.rs
@@ -45,6 +45,10 @@ pub struct IncomingServer {
    #[serde(rename = "socketType")]
    pub socket_type: String,
    pub username: String,
+    /// Authentication method from the XML, e.g. "OAuth2", "password-cleartext",
+    /// "password-encrypted", "GSSAPI", "NTLM".  Absent in DNS SRV fallback.
+    #[serde(default)]
+    pub authentication: String,
 }

 #[derive(Debug, Clone, Default, PartialEq, Eq, Deserialize)]
@@ -137,6 +141,7 @@ async fn lookup_srv(domain: &str) -> Option<MailConfig> {
            port: imap_port,
            socket_type: "SSL".to_string(),
            username: "%EMAILADDRESS%".to_string(),
+            authentication: String::new(),
        }],
        outgoing: vec![OutgoingServer {
            protocol: "smtp".to_string(),
@@ -153,30 +158,37 @@ async fn lookup_srv(domain: &str) -> Option<MailConfig> {
 // ---------------------------------------------------------------------------

 /// Discover mail server configuration for a domain using the Thunderbird
-/// autoconfig protocol (ISPDB) and DNS SRV fallback.
+/// autoconfig protocol (ISPDB), DNS SRV, MX fallback, and finally guessing.
 ///
 /// Probe order:
 /// 1. `https://autoconfig.{domain}/mail/config-v1.1.xml`
-/// 2. `https://{domain}/.well-known/autoconfig/mail/config-v1.1.xml`
-/// 3. DNS SRV records (`_imaps._tcp` / `_submission._tcp`)
-/// 4. Thunderbird central ISPDB (`https://autoconfig.thunderbird.net/v1.1/{domain}`)
+/// 2. `http://autoconfig.{domain}/mail/config-v1.1.xml`
+/// 3. `https://{domain}/.well-known/autoconfig/mail/config-v1.1.xml`
+/// 4. `http://{domain}/.well-known/autoconfig/mail/config-v1.1.xml`
+/// 5. DNS SRV records (`_imaps._tcp` / `_submission._tcp`)
+/// 6. Thunderbird central ISPDB (`https://autoconfig.thunderbird.net/v1.1/{domain}`)
+/// 7. MX lookup → ISPDB for MX domain
+/// 8. MX lookup → ISP autoconfig for MX domain
+/// 9. GuessConfig — probe common hostnames + ports
 pub async fn fetch(domain: &str) -> BichonResult<MailConfig> {
    let client = Client::builder()
        .timeout(std::time::Duration::from_secs(10))
        .build()
        .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;

-    // 1. Try autoconfig subdomain
-    if let Some(config) = fetch_xml(
-        &client,
-        &format!("https://autoconfig.{domain}/mail/config-v1.1.xml"),
-    )
-    .await
+    // ── ISP autoconfig (HTTPS, then HTTP) ──────────────────────────
+    if let Some(config) =
+        fetch_xml(&client, &format!("https://autoconfig.{domain}/mail/config-v1.1.xml")).await
+    {
+        return Ok(config);
+    }
+    if let Some(config) =
+        fetch_xml(&client, &format!("http://autoconfig.{domain}/mail/config-v1.1.xml")).await
    {
        return Ok(config);
    }

-    // 2. Try well-known path
+    // ── Well-known path (HTTPS, then HTTP) ─────────────────────────
    if let Some(config) = fetch_xml(
        &client,
        &format!("https://{domain}/.well-known/autoconfig/mail/config-v1.1.xml"),
@@ -185,28 +197,100 @@ pub async fn fetch(domain: &str) -> BichonResult<MailConfig> {
    {
        return Ok(config);
    }
+    if let Some(config) = fetch_xml(
+        &client,
+        &format!("http://{domain}/.well-known/autoconfig/mail/config-v1.1.xml"),
+    )
+    .await
+    {
+        return Ok(config);
+    }

-    // 3. Try DNS SRV records
+    // ── DNS SRV records ────────────────────────────────────────────
    if let Some(config) = lookup_srv(domain).await {
        return Ok(config);
    }

-    // 4. Fall back to Thunderbird central database
-    if let Some(config) = fetch_xml(
-        &client,
-        &format!("https://autoconfig.thunderbird.net/v1.1/{domain}"),
-    )
-    .await
+    // ── Thunderbird central ISPDB ──────────────────────────────────
+    if let Some(config) =
+        fetch_xml(&client, &format!("https://autoconfig.thunderbird.net/v1.1/{domain}")).await
    {
        return Ok(config);
    }

+    // ── MX fallback ────────────────────────────────────────────────
+    if let Some(config) = fetch_for_mx(&client, domain).await {
+        return Ok(config);
+    }
+
+    // ── GuessConfig ────────────────────────────────────────────────
+    if let Some(config) = crate::autoconfig::guess::guess_config(domain).await {
+        return Ok(config);
+    }
+
    Err(raise_error!(
        format!("No autoconfig found for domain: {domain}"),
        ErrorCode::InternalError
    ))
 }

+/// DNS MX lookup → retry ISPDB and ISP autoconfig for the MX domain.
+///
+/// Many self-hosted domains have their MX pointed at Google, Microsoft, etc.
+/// The MX domain's ISPDB entry covers the original domain.
+async fn fetch_for_mx(client: &Client, domain: &str) -> Option<MailConfig> {
+    let mx_domain = lookup_mx_domain(domain).await?;
+    if mx_domain == domain.to_ascii_lowercase() {
+        return None; // same domain, already tried above
+    }
+
+    // Try ISPDB for the MX domain
+    if let Some(config) =
+        fetch_xml(client, &format!("https://autoconfig.thunderbird.net/v1.1/{mx_domain}")).await
+    {
+        return Some(config);
+    }
+
+    // Try ISP autoconfig for the MX domain (HTTPS then HTTP)
+    if let Some(config) =
+        fetch_xml(client, &format!("https://autoconfig.{mx_domain}/mail/config-v1.1.xml")).await
+    {
+        return Some(config);
+    }
+    if let Some(config) =
+        fetch_xml(client, &format!("http://autoconfig.{mx_domain}/mail/config-v1.1.xml")).await
+    {
+        return Some(config);
+    }
+
+    None
+}
+
+/// DNS MX lookup → extract the second-level domain of the first MX hostname.
+async fn lookup_mx_domain(domain: &str) -> Option<String> {
+    let resolver = TokioResolver::builder(TokioConnectionProvider::default())
+        .ok()?
+        .build();
+    let lookup = resolver.mx_lookup(domain).await.ok()?;
+    let record = lookup.iter().next()?;
+    let mx_host = record.to_string().trim_end_matches('.').to_string();
+
+    // Extract a reasonable base domain from the MX hostname.
+    // E.g., "aspmx.l.google.com" → "google.com"
+    //       "company.mail.protection.outlook.com" → "outlook.com"
+    extract_base_domain(&mx_host)
+}
+
+/// Extract the top two labels from a hostname as a rough base domain.
+fn extract_base_domain(host: &str) -> Option<String> {
+    let parts: Vec<&str> = host.split('.').collect();
+    if parts.len() >= 2 {
+        Some(parts[parts.len() - 2..].join("."))
+    } else {
+        None
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
--- a/crates/core/src/autoconfig/guess.rs
+++ b/crates/core/src/autoconfig/guess.rs
@@ -0,0 +1,105 @@
+//
+// Copyright (c) 2025-2026 rustmailer.com (https://rustmailer.com)
+//
+// This file is part of the Bichon Email Archiving Project
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use crate::account::entity::Encryption;
+use crate::autoconfig::client::{IncomingServer, MailConfig};
+use crate::imap::client::Client;
+use tracing::{debug, info};
+
+/// A single host:port:encryption combination to probe.
+struct Guess {
+    hostname: String,
+    port: u16,
+    encryption: Encryption,
+    socket_type: &'static str,
+}
+
+/// Generate candidates in the same order Thunderbird uses:
+/// 1. imap.{domain}          — most common
+/// 2. mail.{domain}          — fallback
+/// 3. {domain}               — bare domain (rare)
+fn make_guesses(domain: &str) -> Vec<Guess> {
+    let hosts = [
+        format!("imap.{domain}"),
+        format!("mail.{domain}"),
+        domain.to_string(),
+    ];
+
+    let mut guesses = Vec::with_capacity(hosts.len() * 2);
+    for host in &hosts {
+        guesses.push(Guess {
+            hostname: host.clone(),
+            port: 993,
+            encryption: Encryption::Ssl,
+            socket_type: "SSL",
+        });
+        guesses.push(Guess {
+            hostname: host.clone(),
+            port: 143,
+            encryption: Encryption::StartTls,
+            socket_type: "STARTTLS",
+        });
+    }
+    guesses
+}
+
+/// Try to open a connection, read the IMAP banner, and close.
+/// Returns `true` if the server responds with an IMAP greeting.
+async fn probe(hostname: &str, port: u16, encryption: &Encryption) -> bool {
+    match Client::connection(hostname, encryption, port, None, true).await {
+        Ok(_) => {
+            debug!("GuessConfig probe succeeded: {hostname}:{port} ({encryption:?})");
+            true
+        }
+        Err(e) => {
+            debug!("GuessConfig probe failed for {hostname}:{port}: {e:?}");
+            false
+        }
+    }
+}
+
+/// Thunderbird-style guessing: try common hostnames and ports, probing
+/// each with a real TCP connection.
+///
+/// Returns the first working `MailConfig`, or `None` if nothing works.
+pub async fn guess_config(domain: &str) -> Option<MailConfig> {
+    let guesses = make_guesses(domain);
+    info!("GuessConfig: trying {} candidates for {domain}", guesses.len());
+
+    for g in &guesses {
+        if probe(&g.hostname, g.port, &g.encryption).await {
+            info!(
+                "GuessConfig: found working IMAP at {}:{} ({})",
+                g.hostname, g.port, g.socket_type
+            );
+            return Some(MailConfig {
+                incoming: vec![IncomingServer {
+                    protocol: "imap".to_string(),
+                    hostname: g.hostname.clone(),
+                    port: g.port,
+                    socket_type: g.socket_type.to_string(),
+                    username: "%EMAILADDRESS%".to_string(),
+                    authentication: String::new(),
+                }],
+                outgoing: vec![],
+            });
+        }
+    }
+
+    None
+}
--- a/crates/core/src/autoconfig/load.rs
+++ b/crates/core/src/autoconfig/load.rs
@@ -19,6 +19,7 @@
 use crate::account::entity::Encryption;
 use crate::autoconfig::client::{self, MailConfig};
 use crate::autoconfig::entity::{MailServerConfig, ServerConfig};
+use crate::autoconfig::oauth2_providers::lookup_oauth2;
 use crate::autoconfig::CachedMailSettings;
 use crate::error::code::ErrorCode;
 use crate::error::BichonResult;
@@ -54,9 +55,17 @@ pub(crate) fn mail_config_to_server_config(config: &MailConfig) -> Option<MailSe
        }
    };

+    // Detect OAuth2 support: the XML <authentication> field and a known
+    // hostname → issuer mapping determine whether the provider supports OAuth2.
+    let oauth2 = if imap.authentication.eq_ignore_ascii_case("OAuth2") {
+        lookup_oauth2(&imap.hostname)
+    } else {
+        None
+    };
+
    Some(MailServerConfig {
        imap: ServerConfig::new(imap.hostname.clone(), port, encryption),
-        oauth2: None,
+        oauth2,
    })
 }

--- a/crates/core/src/autoconfig/mod.rs
+++ b/crates/core/src/autoconfig/mod.rs
@@ -24,7 +24,9 @@ use serde::{Deserialize, Serialize};

 pub mod client;
 pub mod entity;
+pub mod guess;
 pub mod load;
+mod oauth2_providers;
 #[cfg(test)]
 mod tests;

--- a/crates/core/src/autoconfig/oauth2_providers.rs
+++ b/crates/core/src/autoconfig/oauth2_providers.rs
@@ -0,0 +1,151 @@
+//
+// Copyright (c) 2025-2026 rustmailer.com (https://rustmailer.com)
+//
+// This file is part of the Bichon Email Archiving Project
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use crate::autoconfig::entity::OAuth2Config;
+
+/// Per-provider OAuth2 metadata, mirroring Thunderbird's `OAuth2Providers.sys.mjs`.
+///
+/// Each entry maps one or more IMAP hostname suffixes to a well-known OIDC issuer
+/// and the IMAP-specific OAuth2 scopes.
+struct Provider {
+    /// Suffixes matched case-insensitively against the end of the IMAP hostname.
+    host_suffixes: &'static [&'static str],
+    /// The OIDC issuer URL used by the provider.
+    issuer: &'static str,
+    /// OAuth2 scope(s) required for IMAP access.
+    scopes: &'static [&'static str],
+}
+
+const PROVIDERS: &[Provider] = &[
+    // Google
+    Provider {
+        host_suffixes: &["imap.gmail.com", ".gmail.com", ".googlemail.com"],
+        issuer: "https://accounts.google.com",
+        scopes: &["https://mail.google.com/"],
+    },
+    // Microsoft (Outlook / Office 365 / Hotmail / Live)
+    Provider {
+        host_suffixes: &[
+            "outlook.office365.com",
+            ".outlook.com",
+            ".hotmail.com",
+            ".live.com",
+            ".office365.com",
+        ],
+        issuer: "https://login.microsoftonline.com/common/v2.0",
+        scopes: &[
+            "https://outlook.office365.com/IMAP.AccessAsUser.All",
+            "offline_access",
+        ],
+    },
+    // Yahoo / AOL / ATT / Verizon
+    Provider {
+        host_suffixes: &[
+            "imap.mail.yahoo.com",
+            ".yahoo.com",
+            ".yahoodns.net",
+            ".aol.com",
+            "imap.aol.com",
+        ],
+        issuer: "https://login.yahoo.com",
+        scopes: &["mail-w"],
+    },
+    // Yandex
+    Provider {
+        host_suffixes: &["imap.yandex.ru", "imap.yandex.com", ".yandex.ru"],
+        issuer: "https://oauth.yandex.com",
+        scopes: &["imap:all"],
+    },
+    // Mail.ru
+    Provider {
+        host_suffixes: &["imap.mail.ru", ".mail.ru", ".bk.ru", ".list.ru", ".inbox.ru"],
+        issuer: "https://o2.mail.ru",
+        scopes: &["imap"],
+    },
+    // Fastmail
+    Provider {
+        host_suffixes: &["imap.fastmail.com", ".fastmail.com"],
+        issuer: "https://www.fastmail.com",
+        scopes: &[
+            "https://www.fastmail.com/dev/imap",
+            "offline_access",
+        ],
+    },
+    // Comcast
+    Provider {
+        host_suffixes: &["imap.comcast.net", ".comcast.net"],
+        issuer: "https://oauth.xfinity.com",
+        scopes: &["https://email.comcast.net/"],
+    },
+];
+
+/// Try to find an OAuth2 provider that matches the given IMAP hostname.
+///
+/// Matching is case-insensitive and done by suffix: a hostname "imap.gmail.com"
+/// matches the suffix ".gmail.com".
+pub fn lookup_oauth2(hostname: &str) -> Option<OAuth2Config> {
+    let host = hostname.to_ascii_lowercase();
+    for provider in PROVIDERS {
+        if provider
+            .host_suffixes
+            .iter()
+            .any(|suffix| host.ends_with(&suffix.to_ascii_lowercase()))
+        {
+            return Some(OAuth2Config {
+                issuer: provider.issuer.to_string(),
+                scope: provider.scopes.iter().map(|s| s.to_string()).collect(),
+                auth_url: String::new(),
+                token_url: String::new(),
+            });
+        }
+    }
+    None
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_known_providers() {
+        let cases = [
+            ("imap.gmail.com", Some("https://accounts.google.com")),
+            ("imap.gmail.com", Some("https://accounts.google.com")),
+            ("outlook.office365.com", Some("https://login.microsoftonline.com/common/v2.0")),
+            ("imap.mail.yahoo.com", Some("https://login.yahoo.com")),
+            ("imap.aol.com", Some("https://login.yahoo.com")),
+            ("imap.yandex.ru", Some("https://oauth.yandex.com")),
+            ("imap.mail.ru", Some("https://o2.mail.ru")),
+            ("imap.fastmail.com", Some("https://www.fastmail.com")),
+            ("imap.comcast.net", Some("https://oauth.xfinity.com")),
+        ];
+        for (hostname, expected_issuer) in &cases {
+            let result = lookup_oauth2(hostname);
+            assert_eq!(
+                result.map(|c| c.issuer),
+                expected_issuer.map(|s| s.to_string()),
+                "failed for hostname: {hostname}"
+            );
+        }
+    }
+
+    #[test]
+    fn test_unknown_provider() {
+        assert!(lookup_oauth2("mail.my-company.example").is_none());
+    }
+}
--- a/crates/core/src/autoconfig/tests.rs
+++ b/crates/core/src/autoconfig/tests.rs
@@ -195,6 +195,7 @@ fn make_imap_server(host: &str, port: u16, socket_type: &str) -> IncomingServer
        port,
        socket_type: socket_type.to_string(),
        username: "%EMAILADDRESS%".to_string(),
+        authentication: String::new(),
    }
 }

@@ -241,6 +242,7 @@ fn convert_no_imap_only_pop3() {
            port: 995,
            socket_type: "SSL".to_string(),
            username: "%EMAILADDRESS%".to_string(),
+            authentication: String::new(),
        }],
        outgoing: vec![],
    };
@@ -266,6 +268,7 @@ fn convert_picks_imap_over_pop3() {
                port: 995,
                socket_type: "SSL".to_string(),
                username: "%EMAILADDRESS%".to_string(),
+                authentication: String::new(),
            },
            make_imap_server("imap.example.com", 993, "SSL"),
        ],
@@ -284,6 +287,7 @@ fn convert_imaps_protocol_variant() {
            port: 993,
            socket_type: "SSL".to_string(),
            username: "%EMAILADDRESS%".to_string(),
+            authentication: String::new(),
        }],
        outgoing: vec![],
    };
@@ -300,9 +304,65 @@ fn convert_case_insensitive_protocol() {
            port: 143,
            socket_type: "STARTTLS".to_string(),
            username: "%EMAILADDRESS%".to_string(),
+            authentication: String::new(),
        }],
        outgoing: vec![],
    };
    let result = mail_config_to_server_config(&config).expect("should recognize 'IMAP'");
    assert_eq!(result.imap.host, "imap.example.com");
 }
+
+#[test]
+fn convert_gmail_oauth2() {
+    let config = MailConfig {
+        incoming: vec![IncomingServer {
+            protocol: "imap".to_string(),
+            hostname: "imap.gmail.com".to_string(),
+            port: 993,
+            socket_type: "SSL".to_string(),
+            username: "%EMAILADDRESS%".to_string(),
+            authentication: "OAuth2".to_string(),
+        }],
+        outgoing: vec![],
+    };
+    let result = mail_config_to_server_config(&config).expect("should convert");
+    let oauth2 = result.oauth2.expect("Gmail should have OAuth2");
+    assert_eq!(oauth2.issuer, "https://accounts.google.com");
+    assert!(oauth2.scope.contains(&"https://mail.google.com/".to_string()));
+}
+
+#[test]
+fn convert_outlook_oauth2() {
+    let config = MailConfig {
+        incoming: vec![IncomingServer {
+            protocol: "imap".to_string(),
+            hostname: "outlook.office365.com".to_string(),
+            port: 993,
+            socket_type: "SSL".to_string(),
+            username: "%EMAILADDRESS%".to_string(),
+            authentication: "OAuth2".to_string(),
+        }],
+        outgoing: vec![],
+    };
+    let result = mail_config_to_server_config(&config).expect("should convert");
+    let oauth2 = result.oauth2.expect("Outlook should have OAuth2");
+    assert!(oauth2.issuer.contains("microsoftonline"));
+}
+
+#[test]
+fn convert_unknown_host_no_oauth2() {
+    // OAuth2 auth flag on an unknown hostname → no OAuth2 returned
+    let config = MailConfig {
+        incoming: vec![IncomingServer {
+            protocol: "imap".to_string(),
+            hostname: "mail.random-isp.example".to_string(),
+            port: 993,
+            socket_type: "SSL".to_string(),
+            username: "%EMAILADDRESS%".to_string(),
+            authentication: "OAuth2".to_string(),
+        }],
+        outgoing: vec![],
+    };
+    let result = mail_config_to_server_config(&config).expect("should convert");
+    assert!(result.oauth2.is_none(), "unknown hostname → no OAuth2 mapping");
+}
--- a/crates/core/src/cache/imap/download/download_type.rs
+++ b/crates/core/src/cache/imap/download/download_type.rs
@@ -16,6 +16,11 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.

+use std::str::FromStr;
+
+use chrono::{DateTime, Local, TimeZone, Utc};
+use cron::Schedule;
+
 use crate::{
    utc_now,
    {
@@ -48,11 +53,20 @@ pub async fn decide_next_download_task(

    let should_start = match trigger_type {
        TriggerType::Manual => true,
-        TriggerType::Scheduled => should_trigger_next_download(
-            state.last_trigger_at,
-            state.last_finished_at.unwrap_or(0),
-            account.download_interval_min.unwrap_or(60),
-        ),
+        TriggerType::Scheduled => {
+            let now = utc_now!();
+            let cooldown_ok = now - state.last_finished_at.unwrap_or(0) > 60 * 1000;
+            if !cooldown_ok {
+                false
+            } else if let Some(ref schedule) = account.download_schedule {
+                should_trigger_scheduled(schedule, state.last_trigger_at)
+            } else {
+                should_trigger_next_download(
+                    state.last_trigger_at,
+                    account.download_interval_min.unwrap_or(60),
+                )
+            }
+        }
    };

    if should_start {
@@ -63,11 +77,80 @@ pub async fn decide_next_download_task(
    }
 }

-fn should_trigger_next_download(
-    last_trigger_at: i64,
-    last_finished_at: i64,
-    sync_interval_min: i64,
-) -> bool {
+fn should_trigger_next_download(last_trigger_at: i64, sync_interval_min: i64) -> bool {
    let now = utc_now!();
-    now - last_trigger_at > (sync_interval_min * 60 * 1000) && now - last_finished_at > 60 * 1000
+    now - last_trigger_at > (sync_interval_min * 60 * 1000)
+}
+
+fn should_trigger_scheduled(schedule_str: &str, last_trigger_at: i64) -> bool {
+    let schedule = match Schedule::from_str(schedule_str) {
+        Ok(s) => s,
+        Err(e) => {
+            tracing::warn!(
+                "Invalid cron expression '{}', falling back to no trigger: {}",
+                schedule_str,
+                e
+            );
+            return false;
+        }
+    };
+    // last_trigger_at is a UTC millis timestamp; convert to server local time
+    let last_utc = match Utc.timestamp_millis_opt(last_trigger_at) {
+        chrono::LocalResult::Single(dt) => dt,
+        _ => {
+            tracing::warn!("Invalid last_trigger_at timestamp: {}", last_trigger_at);
+            return false;
+        }
+    };
+    let last_dt: DateTime<Local> = last_utc.with_timezone(&Local);
+    let now = Local::now();
+    schedule
+        .after(&last_dt)
+        .next()
+        .map_or(false, |next| next <= now)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn cron_every_minute_triggers_after_60s() {
+        // "0 * * * * *" = every minute at second 0. last_trigger 90s ago → should trigger
+        let now = Local::now();
+        let last_trigger = now.timestamp_millis() - 90_000;
+        assert!(should_trigger_scheduled("0 * * * * *", last_trigger));
+    }
+
+    #[test]
+    fn cron_daily_midnight_triggers_when_missed() {
+        // "0 0 0 * * *" = daily at midnight
+        // last_trigger was 25 hours ago → should trigger (we missed midnight)
+        let now = Local::now();
+        let last_trigger = now.timestamp_millis() - 25 * 60 * 60 * 1000;
+        assert!(should_trigger_scheduled("0 0 0 * * *", last_trigger));
+    }
+
+    #[test]
+    fn cron_daily_midnight_no_trigger_if_already_fired() {
+        // "0 0 0 * * *" = daily at midnight
+        // last_trigger was 1 minute ago → should NOT trigger
+        let now = Local::now();
+        let last_trigger = now.timestamp_millis() - 60_000;
+        assert!(!should_trigger_scheduled("0 0 0 * * *", last_trigger));
+    }
+
+    #[test]
+    fn invalid_cron_returns_false() {
+        assert!(!should_trigger_scheduled("invalid cron expression", 0));
+    }
+
+    #[test]
+    fn cron_every_hour_triggers() {
+        // "0 0 * * * *" = every hour at minute 0, second 0
+        // last_trigger was 61 minutes ago → should trigger
+        let now = Local::now();
+        let last_trigger = now.timestamp_millis() - 61 * 60 * 1000;
+        assert!(should_trigger_scheduled("0 0 * * * *", last_trigger));
+    }
 }
--- a/crates/core/src/cache/imap/download/flow.rs
+++ b/crates/core/src/cache/imap/download/flow.rs
@@ -32,7 +32,9 @@ use crate::{
            SEMAPHORE,
        },
        error::{code::ErrorCode, BichonResult},
-        imap::executor::ImapExecutor,
+        imap::executor::{
+            generate_uid_sequence_hashset, ImapExecutor, DEFAULT_BATCH_SIZE,
+        },
        store::tantivy::envelope::ENVELOPE_MANAGER,
    },
 };
@@ -40,7 +42,6 @@ use std::time::Instant;
 use tokio_util::sync::CancellationToken;
 use tracing::{debug, error, info, warn};

-pub const DEFAULT_BATCH_SIZE: u32 = 30;

 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum FetchDirection {
@@ -54,7 +55,7 @@ pub async fn fetch_and_save_by_date(
    mailbox: &MailBox,
    direction: FetchDirection,
    token: CancellationToken,
-) -> BichonResult<()> {
+) -> BichonResult<Option<u32>> {
    let account_id = account.id;
    let mut session = match ImapExecutor::create_connection(account_id).await {
        Ok(session) => session,
@@ -108,32 +109,18 @@ pub async fn fetch_and_save_by_date(
            FolderStatus::Success,
            None,
        )?;
-        return Ok(());
+        return Ok(None);
    }

-    let folder_limit = account.folder_limit;
    // sort small -> bigger
    let mut uid_vec: Vec<u32> = uid_list.into_iter().collect();
    uid_vec.sort();

-    if let Some(limit) = folder_limit {
-        let limit = limit.max(100) as usize;
-        if len > limit {
-            uid_vec = match direction {
-                FetchDirection::Since => uid_vec.split_off(len - limit),
-                FetchDirection::Before => {
-                    uid_vec.truncate(limit);
-                    uid_vec
-                }
-            };
-        }
-    }
-
+    let max_uid = uid_vec.last().copied();
    let planned = uid_vec.len() as u64;
    let uid_batches = generate_uid_sequence_hashset(
        uid_vec,
        account.download_batch_size.unwrap_or(DEFAULT_BATCH_SIZE) as usize,
-        false,
    );
    DownloadState::update_folder_progress(
        account_id,
@@ -212,14 +199,16 @@ pub async fn fetch_and_save_by_date(
        )?;
    }
    session.logout().await.ok();
-    Ok(())
+    Ok(max_uid)
 }

+/// Fetches all messages from a mailbox.
+/// Returns `Ok(Some(max_uid))` with the highest UID stored, or `Ok(None)` if empty.
 pub async fn fetch_and_save_full_mailbox(
    account: &AccountModel,
    mailbox: &MailBox,
    token: CancellationToken,
-) -> BichonResult<()> {
+) -> BichonResult<Option<u32>> {
    let mailbox_id = mailbox.id;
    let account_id = account.id;

@@ -262,33 +251,17 @@ pub async fn fetch_and_save_full_mailbox(
        }
    };

-    let folder_limit = account.folder_limit;
-    let total_to_fetch = match folder_limit {
-        Some(limit) if (limit as u64) < total => {
-            let limit64 = limit as u64;
-            total.min(limit64.max(100))
-        }
-        _ => total,
-    };
-
-    let page_size = if let Some(limit) = folder_limit {
-        limit
-            .max(100)
-            .min(account.download_batch_size.unwrap_or(DEFAULT_BATCH_SIZE))
-    } else {
-        account.download_batch_size.unwrap_or(DEFAULT_BATCH_SIZE)
-    };
-
-    let total_batches = total_to_fetch.div_ceil(page_size as u64);
-    let desc = folder_limit.is_some();
+    let page_size = account.download_batch_size.unwrap_or(DEFAULT_BATCH_SIZE);
+    let total_batches = total.div_ceil(page_size as u64);

    info!(
-        "Starting full mailbox download for '{}', total={}, limit={:?}, batches={}, desc={}",
-        mailbox.name, total, folder_limit, total_batches, desc
+        "Starting full mailbox download for '{}', total={}, batches={}",
+        mailbox.name, total, total_batches
    );

    let mut current_processed = 0u64;
    let mut has_error_or_cancel = false;
+    let mut max_uid: Option<u32> = None;

    for page in 1..=total_batches {
        if token.is_cancelled() {
@@ -300,7 +273,7 @@ pub async fn fetch_and_save_full_mailbox(
            DownloadState::update_folder_progress(
                account_id,
                mailbox.name.clone(),
-                total_to_fetch,
+                total,
                current_processed,
                FolderStatus::Cancelled,
                None,
@@ -313,12 +286,12 @@ pub async fn fetch_and_save_full_mailbox(
            &mut session,
            account_id,
            mailbox_id,
-            total_to_fetch,
+            total,
            page as u64,
            page_size as u64,
            &mailbox.encoded_name(),
-            desc,
            token.clone(),
+            &mut max_uid,
        )
        .await
        {
@@ -327,7 +300,7 @@ pub async fn fetch_and_save_full_mailbox(
                DownloadState::update_folder_progress(
                    account_id,
                    mailbox.name.clone(),
-                    total_to_fetch,
+                    total,
                    current_processed,
                    FolderStatus::Downloading,
                    None,
@@ -339,7 +312,7 @@ pub async fn fetch_and_save_full_mailbox(
                DownloadState::update_folder_progress(
                    account_id,
                    mailbox.name.clone(),
-                    total_to_fetch,
+                    total,
                    current_processed,
                    FolderStatus::Failed,
                    Some(err_msg),
@@ -354,71 +327,14 @@ pub async fn fetch_and_save_full_mailbox(
        DownloadState::update_folder_progress(
            account_id,
            mailbox.name.clone(),
-            total_to_fetch,
+            total,
            current_processed,
            FolderStatus::Success,
            None,
        )?;
    }
    session.logout().await.ok();
-    Ok(())
-}
-
-pub fn generate_uid_sequence_hashset(
-    unique_nums: Vec<u32>,
-    chunk_size: usize,
-    desc: bool,
-) -> Vec<(String, u64)> {
-    assert!(!unique_nums.is_empty());
-    let mut nums = unique_nums;
-    if desc {
-        nums.reverse();
-    }
-
-    let mut result = Vec::new();
-
-    for chunk in nums.chunks(chunk_size) {
-        let size = chunk.len() as u64;
-        let compressed = compress_uid_list(chunk.to_vec());
-        result.push((compressed, size));
-    }
-
-    result
-}
-
-pub fn compress_uid_list(nums: Vec<u32>) -> String {
-    if nums.is_empty() {
-        return String::new();
-    }
-
-    let mut sorted_nums = nums;
-    sorted_nums.sort();
-
-    let mut result = Vec::new();
-    let mut current_range_start = sorted_nums[0];
-    let mut current_range_end = sorted_nums[0];
-
-    for &n in sorted_nums.iter().skip(1) {
-        if n == current_range_end + 1 {
-            current_range_end = n;
-        } else {
-            if current_range_start == current_range_end {
-                result.push(current_range_start.to_string());
-            } else {
-                result.push(format!("{}:{}", current_range_start, current_range_end));
-            }
-            current_range_start = n;
-            current_range_end = n;
-        }
-    }
-
-    if current_range_start == current_range_end {
-        result.push(current_range_start.to_string());
-    } else {
-        result.push(format!("{}:{}", current_range_start, current_range_end));
-    }
-
-    result.join(",")
+    Ok(max_uid)
 }

 pub async fn reconcile_mailboxes(
@@ -448,7 +364,7 @@ pub async fn reconcile_mailboxes(
                break;
            }

-            if local_mailbox.uid_validity != remote_mailbox.uid_validity {
+            let new_highest_uid = if local_mailbox.uid_validity != remote_mailbox.uid_validity {
                if remote_mailbox.uid_validity.is_none() {
                    let err_msg = format!(
                        "Mailbox '{}' logic error: Server did not provide UIDVALIDITY.",
@@ -493,7 +409,7 @@ pub async fn reconcile_mailboxes(
                            FetchDirection::Since,
                            token.clone(),
                        )
-                        .await?;
+                        .await?
                    }
                    None => match &account.date_before {
                        Some(r) => {
@@ -505,7 +421,7 @@ pub async fn reconcile_mailboxes(
                                FetchDirection::Before,
                                token.clone(),
                            )
-                            .await?;
+                            .await?
                        }
                        None => {
                            rebuild_mailbox_cache(
@@ -520,10 +436,12 @@ pub async fn reconcile_mailboxes(
                }
            } else {
                perform_incremental_sync(account, local_mailbox, remote_mailbox, token.clone())
-                    .await?;
-            }
+                    .await?
+            };

-            mailboxes_to_update.push(remote_mailbox.clone());
+            let mut updated = remote_mailbox.clone();
+            updated.highest_uid = new_highest_uid;
+            mailboxes_to_update.push(updated);
        }
        //The metadata of this mailbox must only be updated after a successful synchronization;
        //otherwise, it may cause synchronization errors and result in missing emails in the local sync results.
@@ -598,7 +516,11 @@ pub async fn reconcile_mailboxes(
                };

                match result {
-                    Ok(_) => {}
+                    Ok(new_highest_uid) => {
+                        let mut updated = mailbox.clone();
+                        updated.highest_uid = new_highest_uid;
+                        MailBox::batch_upsert(&[updated])?;
+                    }
                    Err(err) => {
                        has_error = true;
                        tracing::error!("Folder sync task failed: {:#?}", err);
@@ -622,57 +544,102 @@ pub async fn reconcile_mailboxes(
 }

 //only check new emails and sync
+/// Incrementally syncs a mailbox.
+/// Returns the new highest UID after sync, or `None` if nothing changed.
 async fn perform_incremental_sync(
    account: &AccountModel,
    local_mailbox: &MailBox,
    remote_mailbox: &MailBox,
    token: CancellationToken,
-) -> BichonResult<()> {
+) -> BichonResult<Option<u32>> {
    if remote_mailbox.exists > 0 {
-        let local_max_uid = ENVELOPE_MANAGER.get_max_uid(account.id, local_mailbox.id)?;
-        match local_max_uid {
-            Some(max_uid) => {
-                let mut session = ImapExecutor::create_connection(account.id).await?;
-                let before_date = account
-                    .date_before
-                    .as_ref()
-                    .map(|r| r.calculate_date())
-                    .transpose()?;
-
-                ImapExecutor::fetch_new_mail(
-                    &mut session,
-                    account,
-                    local_mailbox,
-                    max_uid + 1,
-                    before_date.as_deref(),
-                    token,
-                )
-                .await?;
-                session.logout().await.ok();
+        // Use stored highest_uid if available; otherwise fall back to Tantivy
+        // query once (backward compatibility with pre-existing databases).
+        let start_uid = match local_mailbox.highest_uid {
+            Some(uid) => {
+                tracing::info!(
+                    "[account {}][mailbox {}] perform_incremental_sync: stored highest_uid={}, remote.exists={}",
+                    account.id,
+                    local_mailbox.name,
+                    uid,
+                    remote_mailbox.exists
+                );
+                uid as u64 + 1
            }
            None => {
-                info!(
-                    "No maximum UID found in index for mailbox, assuming local cache is missing."
+                let local_max_uid =
+                    ENVELOPE_MANAGER.get_max_uid(account.id, local_mailbox.id)?;
+                tracing::info!(
+                    "[account {}][mailbox {}] perform_incremental_sync: highest_uid unset, Tantivy max_uid={:?}, remote.exists={}",
+                    account.id,
+                    local_mailbox.name,
+                    local_max_uid,
+                    remote_mailbox.exists
                );
-
-                match &account.date_since {
-                    Some(date_since) => {
-                        fetch_and_save_by_date(
-                            account,
-                            date_since.since_date()?.as_str(),
-                            remote_mailbox,
-                            FetchDirection::Since,
-                            token,
-                        )
-                        .await?;
-                    }
+                match local_max_uid {
+                    Some(uid) => uid + 1,
                    None => {
-                        fetch_and_save_full_mailbox(account, remote_mailbox, token).await?;
+                        info!(
+                            "No maximum UID found in index for mailbox, assuming local storage is missing."
+                        );
+
+                        let result = match &account.date_since {
+                            Some(date_since) => {
+                                fetch_and_save_by_date(
+                                    account,
+                                    date_since.since_date()?.as_str(),
+                                    remote_mailbox,
+                                    FetchDirection::Since,
+                                    token,
+                                )
+                                .await?
+                            }
+                            None => match &account.date_before {
+                                Some(r) => {
+                                    fetch_and_save_by_date(
+                                        account,
+                                        &r.calculate_date()?,
+                                        remote_mailbox,
+                                        FetchDirection::Before,
+                                        token,
+                                    )
+                                    .await?
+                                }
+                                None => {
+                                    fetch_and_save_full_mailbox(
+                                        account, remote_mailbox, token,
+                                    )
+                                    .await?
+                                }
+                            },
+                        };
+                        return Ok(result);
                    }
                }
            }
-        }
-    }
+        };

-    Ok(())
+        let mut session = ImapExecutor::create_connection(account.id).await?;
+        let before_date = account
+            .date_before
+            .as_ref()
+            .map(|r| r.calculate_date())
+            .transpose()?;
+
+        let new_max_uid = ImapExecutor::fetch_new_mail(
+            &mut session,
+            account,
+            local_mailbox,
+            start_uid,
+            before_date.as_deref(),
+            token,
+        )
+        .await?;
+        session.logout().await.ok();
+
+        // Keep existing highest_uid if no new mail was fetched.
+        Ok(new_max_uid.or(local_mailbox.highest_uid))
+    } else {
+        Ok(local_mailbox.highest_uid)
+    }
 }
--- a/crates/core/src/cache/imap/download/rebuild.rs
+++ b/crates/core/src/cache/imap/download/rebuild.rs
@@ -89,7 +89,11 @@ pub async fn rebuild_cache(
        };

        match fetch_and_save_full_mailbox(&account, &mailbox, token.clone()).await {
-            Ok(_) => {}
+            Ok(new_highest_uid) => {
+                let mut updated = mailbox.clone();
+                updated.highest_uid = new_highest_uid;
+                MailBox::batch_upsert(&[updated])?;
+            }
            Err(err) => {
                has_error = true;
                tracing::error!("Folder sync task failed: {:#?}", err);
@@ -169,7 +173,11 @@ pub async fn rebuild_cache_by_date(
        match fetch_and_save_by_date(&account, date.as_str(), &mailbox, direction, token.clone())
            .await
        {
-            Ok(_) => {}
+            Ok(new_highest_uid) => {
+                let mut updated = mailbox.clone();
+                updated.highest_uid = new_highest_uid;
+                MailBox::batch_upsert(&[updated])?;
+            }
            Err(err) => {
                has_error = true;
                tracing::error!("Folder sync task failed: {:#?}", err);
@@ -196,7 +204,7 @@ pub async fn rebuild_mailbox_cache(
    local_mailbox: &MailBox,
    remote_mailbox: &MailBox,
    token: CancellationToken,
-) -> BichonResult<()> {
+) -> BichonResult<Option<u32>> {
    ENVELOPE_MANAGER
        .delete_mailbox_envelopes(account.id, vec![local_mailbox.id])
        .await?;
@@ -217,11 +225,11 @@ pub async fn rebuild_mailbox_cache(
            FolderStatus::Success,
            None,
        )?;
-        return Ok(());
+        return Ok(None);
    }

-    fetch_and_save_full_mailbox(account, remote_mailbox, token).await?;
-    Ok(())
+    let result = fetch_and_save_full_mailbox(account, remote_mailbox, token).await?;
+    Ok(result)
 }

 pub async fn rebuild_mailbox_cache_by_date(
@@ -231,7 +239,7 @@ pub async fn rebuild_mailbox_cache_by_date(
    remote: &MailBox,
    direction: FetchDirection,
    token: CancellationToken,
-) -> BichonResult<()> {
+) -> BichonResult<Option<u32>> {
    ENVELOPE_MANAGER
        .delete_mailbox_envelopes(account.id, vec![local_mailbox_id])
        .await?;
@@ -252,9 +260,9 @@ pub async fn rebuild_mailbox_cache_by_date(
            FolderStatus::Success,
            None,
        )?;
-        return Ok(());
+        return Ok(None);
    }

-    fetch_and_save_by_date(account, date, remote, direction, token).await?;
-    Ok(())
+    let result = fetch_and_save_by_date(account, date, remote, direction, token).await?;
+    Ok(result)
 }
--- a/crates/core/src/cache/imap/mailbox.rs
+++ b/crates/core/src/cache/imap/mailbox.rs
@@ -56,6 +56,10 @@ pub struct MailBox {
    /// The validity identifier for UIDs in this mailbox, used to ensure UID consistency across sessions.
    /// If `None`, the IMAP server has not provided this information.
    pub uid_validity: Option<u32>,
+    /// The highest UID that has been successfully downloaded and stored locally.
+    /// Used for incremental sync: next fetch starts from `highest_uid + 1`.
+    /// If `None`, a fallback query against the Tantivy index will be performed once.
+    pub highest_uid: Option<u32>,
 }

 impl MemDbModel for MailBox {
--- a/crates/core/src/database/manager.rs
+++ b/crates/core/src/database/manager.rs
@@ -32,12 +32,16 @@ impl DatabaseManager {
        let db_path = &DATA_DIR_MANAGER.memdb_dir;
        std::fs::create_dir_all(db_path).expect("Failed to create memdb data directory");

-        let db = MemDb::open_with(db_path, Durability::Full)
+        let db = MemDb::open_with(db_path, Durability::Batch { max_ops: 100 })
            .expect("Failed to open memdb database");

        // Start periodic snapshot worker (every 5 minutes)
        db.start_snapshot_worker(Duration::from_secs(300));

+        // Start periodic flush worker (every 10 seconds) so buffered writes
+        // are flushed regularly and not only at the batch threshold.
+        db.start_flush_worker(Duration::from_secs(10));
+
        DatabaseManager { db }
    }

@@ -45,4 +49,12 @@ impl DatabaseManager {
    pub fn db(&self) -> &MemDb {
        &self.db
    }
+
+    /// Flush any buffered WAL entries to disk. Must be called before shutdown
+    /// to avoid losing writes that haven't hit the batch threshold yet.
+    pub fn flush(&self) {
+        if let Err(e) = self.db.flush() {
+            eprintln!("[memdb] flush error on shutdown: {e}");
+        }
+    }
 }
--- a/crates/core/src/envelope/extractor.rs
+++ b/crates/core/src/envelope/extractor.rs
@@ -16,11 +16,13 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.

+use crate::cache::imap::mailbox::MailBox;
 use crate::common::AddrVec;
 use crate::envelope::meta::parse_bichon_metadata;
 use crate::envelope::utils::normalize_subject;
 use crate::error::code::ErrorCode;
 use crate::error::BichonResult;
+use crate::imap::executor::ImapExecutor;
 use crate::message::content::AttachmentInfo;
 use crate::store::blob::{DetachedEmail, BLOB_MANAGER};
 use crate::store::tantivy::attachment::ATTACHMENT_MANAGER;
@@ -87,6 +89,7 @@ async fn extract_envelope_core(
    account_id: u64,
    mailbox_id: u64,
 ) -> BichonResult<()> {
+    //The content hash of the original raw EML
    let email_content_hash = compute_content_hash(body);
    let message: Message<'_> = MessageParser::new().parse(body).ok_or_else(|| {
        raise_error!(
@@ -194,33 +197,37 @@ async fn extract_envelope_core(
    let attachment_docs: Vec<TantivyDocument> = attachments
        .iter()
        .filter(|a| !a.inline || a.content_id.is_none())
-        .map(|a| AttachmentModel {
-            id: Uuid::new_v4().to_string(),
-            envelope_id: envelope_id.clone(),
-            account_id,
-            account_email: None,
-            mailbox_id,
-            mailbox_name: None,
-            subject: subject.clone(),
-            content_hash: a.content_hash.clone(),
-            from: from.clone(),
-            date,
-            ingest_at: now,
-            size: a.size as u64,
-            ext: a.get_extension(),
-            category: a.get_category().to_string(),
-            content_type: a.file_type.clone(),
-            shard_id: 0,
-            text: None,
-            has_text: false,
-            is_ocr: false,
-            page_count: None,
-            is_indexed: false,
-            is_message: a.is_message,
-            name: a.filename.clone(),
-            tags: None,
-            auto_tags: None,
-        }).map(|a|a.into_document())
+        .map(|a| {
+            let has_text = a.extracted_text.is_some();
+            AttachmentModel {
+                id: Uuid::new_v4().to_string(),
+                envelope_id: envelope_id.clone(),
+                account_id,
+                account_email: None,
+                mailbox_id,
+                mailbox_name: None,
+                subject: subject.clone(),
+                content_hash: a.content_hash.clone(),
+                from: from.clone(),
+                date,
+                ingest_at: now,
+                size: a.size as u64,
+                ext: a.get_extension(),
+                category: a.get_category().to_string(),
+                content_type: a.file_type.clone(),
+                shard_id: 0,
+                text: a.extracted_text.clone(),
+                has_text,
+                is_ocr: a.extracted_is_ocr,
+                page_count: a.extracted_page_count.map(|n| n as u64),
+                is_indexed: has_text,
+                is_message: a.is_message,
+                name: a.filename.clone(),
+                tags: None,
+                auto_tags: None,
+            }
+        })
+        .map(|a| a.into_document())
        .collect();

    let envelope = Envelope {
@@ -253,6 +260,14 @@ async fn extract_envelope_core(
        attachments: Some(attachments),
    };
    let doc = ea.to_document(&body_text, 0)?;
+    tracing::debug!(
+        "[account {}][mailbox {}] extract: uid={} msg_id={} content_hash={}",
+        account_id,
+        mailbox_id,
+        uid,
+        &ea.envelope.message_id,
+        &ea.envelope.content_hash,
+    );
    ENVELOPE_MANAGER.queue(doc).await;
    for doc in attachment_docs {
        ATTACHMENT_MANAGER.queue(doc).await;
@@ -386,11 +401,23 @@ pub async fn detach_and_store_attachments(

    ranges.sort_by(|a, b| b.0.cmp(&a.0));
    let mut attachments = Vec::with_capacity(ranges.len());
+
+    // Collect candidates for text extraction (non-inline, known document types).
+    struct TextCandidate {
+        content_hash: String,
+        file_type: String,
+        ext: String,
+        bytes: Vec<u8>,
+    }
+    let mut text_candidates: Vec<TextCandidate> = Vec::new();
+
    for (raw_start, raw_end, att) in ranges {
        // Step 2: Extract raw bytes and store them as standalone documents
        let raw_bytes = &original_body[raw_start..raw_end];
+        //This is the content hash of the decoded attachment, not the undecoded one.
        let content_hash = compute_content_hash(att.contents());

+        //"The actual content stored in the blob is the raw undecoded data, to avoid the reconstructed EML differing from the original due to decoding and re-encoding.
        attachments.push((content_hash.clone(), Bytes::copy_from_slice(raw_bytes)));//

        // Step 3: Replace raw attachment content with a hash-based placeholder
@@ -398,30 +425,88 @@ pub async fn detach_and_store_attachments(
        let p_bytes = placeholder.as_bytes();
        stripped_eml.splice(raw_start..raw_end, p_bytes.iter().cloned());

+        let inline = att
+            .content_disposition()
+            .map(|d| d.is_inline())
+            .unwrap_or(false);
+        let file_type = att
+            .content_type()
+            .map(|ct| {
+                format!(
+                    "{}/{}",
+                    ct.c_type.as_ref(),
+                    ct.c_subtype.as_deref().unwrap_or("")
+                )
+            })
+            .unwrap_or_else(|| "application/octet-stream".to_string());
+        let has_cid = att.content_id().is_some();
+        let ext = att
+            .attachment_name()
+            .and_then(|n| {
+                std::path::Path::new(&n)
+                    .extension()
+                    .and_then(|e| e.to_str())
+                    .map(|s| s.to_ascii_lowercase())
+            })
+            .unwrap_or_default();
+
+        if !inline || !has_cid {
+            let decoded_len = att.contents().len();
+            if decoded_len <= crate::ext::text_extractor::MAX_EXTRACT_BYTES
+                && crate::ext::text_extractor::should_try_extract(&file_type, &ext)
+            {
+                text_candidates.push(TextCandidate {
+                    content_hash: content_hash.clone(),
+                    file_type: file_type.clone(),
+                    ext: ext.clone(),
+                    bytes: att.contents().to_vec(),
+                });
+            }
+        }
+
        let info = AttachmentInfo {
            filename: att.attachment_name().map(|n| n.to_string()),
            size: att.contents().len(),
-            inline: att
-                .content_disposition()
-                .map(|d| d.is_inline())
-                .unwrap_or(false),
-            file_type: att
-                .content_type()
-                .map(|ct| {
-                    format!(
-                        "{}/{}",
-                        ct.c_type.as_ref(),
-                        ct.c_subtype.as_deref().unwrap_or("")
-                    )
-                })
-                .unwrap_or_else(|| "application/octet-stream".to_string()),
+            inline,
+            file_type,
            content_id: att.content_id().map(|id| id.to_string()),
            content_hash: content_hash.clone(),
            is_message: att.is_message(),
+            extracted_text: None,
+            extracted_page_count: None,
+            extracted_is_ocr: false,
        };

        attachment_infos.push(info);
    }
+
+    // Run text extraction in a single spawn_blocking batch.
+    if !text_candidates.is_empty() {
+        if let Ok(mut extracted_map) = tokio::task::spawn_blocking(move || {
+            let mut map: std::collections::HashMap<
+                String,
+                (String, Option<u32>, bool),
+            > = std::collections::HashMap::new();
+            for c in text_candidates {
+                if let Some(r) =
+                    crate::ext::text_extractor::extract_text(&c.file_type, &c.ext, &c.bytes)
+                {
+                    map.insert(c.content_hash, (r.text, r.page_count, r.is_ocr));
+                }
+            }
+            map
+        })
+        .await
+        {
+            for info in &mut attachment_infos {
+                if let Some((text, pages, is_ocr)) = extracted_map.remove(&info.content_hash) {
+                    info.extracted_text = Some(text);
+                    info.extracted_page_count = pages;
+                    info.extracted_is_ocr = is_ocr;
+                }
+            }
+        }
+    }
    // Step 4: Store the final stripped EML content
    BLOB_MANAGER
        .queue(DetachedEmail {
@@ -515,6 +600,114 @@ pub fn reattach_eml_content(
    Ok((e.envelope, Bytes::from(restored_eml)))
 }

+/// Returns the raw EML for an indexed message, self-healing a missing content blob.
+///
+/// Behaves like [`reattach_eml_content`], but when the message's content blob is
+/// absent from the blob store it fetches that single message on demand from the
+/// IMAP server (`UID FETCH <uid> (BODY.PEEK[])`), persists it for future requests,
+/// and returns it. If the on-demand fetch itself fails, the original "content not
+/// found" error from [`reattach_eml_content`] is surfaced unchanged so the caller
+/// still produces its 404.
+pub async fn reattach_eml_content_self_healing(
+    account_id: u64,
+    envelope_id: String,
+) -> BichonResult<(Envelope, Bytes)> {
+    let envelope = ENVELOPE_MANAGER
+        .get_envelope_by_id(account_id, &envelope_id)?
+        .ok_or_else(|| {
+            raise_error!(
+                format!(
+                    "Envelope not found: account_id={} envelope_id={}",
+                    account_id, &envelope_id
+                ),
+                ErrorCode::ResourceNotFound
+            )
+        })?
+        .envelope;
+
+    // Fast path: the content blob is present, reuse the regular reattach logic.
+    if BLOB_MANAGER.get_email(&envelope.content_hash)?.is_some() {
+        return reattach_eml_content(account_id, envelope_id);
+    }
+
+    // The blob is missing. Try to recover it directly from the IMAP server.
+    match recover_message_blob(&envelope).await {
+        Ok(raw_body) => {
+            tracing::info!(
+                account_id,
+                envelope_id = %envelope_id,
+                uid = envelope.uid,
+                "Self-healed missing email content blob via on-demand IMAP fetch"
+            );
+            Ok((envelope, raw_body))
+        }
+        Err(e) => {
+            tracing::warn!(
+                account_id,
+                envelope_id = %envelope_id,
+                uid = envelope.uid,
+                error = %e,
+                "On-demand IMAP fetch for missing content blob failed; returning not-found"
+            );
+            Err(e)
+        }
+    }
+}
+
+/// Fetches one message from IMAP and re-stores its detached blob.
+///
+/// On success the freshly fetched raw RFC822 body is returned; it is also queued
+/// (in detached form) into the blob store so subsequent requests hit the cache.
+/// Fails if the message cannot be fetched, or if the fetched bytes do not match
+/// the archived `content_hash` (the server-side message no longer matches what
+/// Bichon archived, so it cannot be treated as a recovery of that blob).
+async fn recover_message_blob(envelope: &Envelope) -> BichonResult<Bytes> {
+    let mailbox = MailBox::find_mailbox(envelope.account_id, envelope.mailbox_id)?
+        .ok_or_else(|| {
+            raise_error!(
+                format!(
+                    "Mailbox not found: account_id={} mailbox_id={}",
+                    envelope.account_id, envelope.mailbox_id
+                ),
+                ErrorCode::ResourceNotFound
+            )
+        })?;
+
+    let mut session = ImapExecutor::create_connection(envelope.account_id).await?;
+    let result = ImapExecutor::fetch_single_message_body(
+        &mut session,
+        &mailbox.encoded_name(),
+        envelope.uid,
+    )
+    .await;
+    session.logout().await.ok();
+    let raw_body = result?;
+
+    let fetched_hash = compute_content_hash(&raw_body);
+    if fetched_hash != envelope.content_hash {
+        return Err(raise_error!(
+            format!(
+                "Fetched message does not match archived content: expected content_hash={} got={}",
+                envelope.content_hash, fetched_hash
+            ),
+            ErrorCode::ImapUnexpectedResult
+        ));
+    }
+
+    // Re-create the detached blob (stripped EML + attachments) so the missing
+    // blob is repopulated for future requests. The detached EML is queued under
+    // `fetched_hash`, which equals `envelope.content_hash`.
+    let message = MessageParser::new().parse(raw_body.as_slice()).ok_or_else(|| {
+        raise_error!(
+            "Failed to parse fetched email content".into(),
+            ErrorCode::InternalError
+        )
+    })?;
+    detach_and_store_attachments(&raw_body, &message, &fetched_hash).await;
+
+    Ok(Bytes::from(raw_body))
+}
+
 #[cfg(test)]
 mod test {
    use html2text::config;
--- a/crates/core/src/ext/event_bus.rs
+++ b/crates/core/src/ext/event_bus.rs
@@ -0,0 +1,86 @@
+//
+// Copyright (c) 2025-2026 rustmailer.com (https://rustmailer.com)
+//
+// This file is part of the Bichon Email Archiving Project
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Event bus extension point.
+//
+// Community edition: NoopEventBus — all events are discarded.
+// Pro edition: AuditEventBus — events are persisted to audit database.
+// Enterprise edition: adds SIEM webhook to the same trait impl.
+//
+// The open-source server emits events at key points (login, view, delete, search).
+// It never reads from the event bus — events are fire-and-forget.
+
+use std::net::IpAddr;
+use std::sync::{LazyLock, RwLock};
+
+#[derive(Debug, Clone)]
+pub enum Event {
+    EmailViewed {
+        email_id: String,
+        user: String,
+        ip: IpAddr,
+    },
+    EmailDeleted {
+        email_id: String,
+        user: String,
+    },
+    UserLoggedIn {
+        user: String,
+        ip: IpAddr,
+    },
+    UserCreated {
+        created_by: String,
+        new_user: String,
+    },
+    SearchPerformed {
+        query: String,
+        user: String,
+    },
+    SettingsChanged {
+        key: String,
+        user: String,
+    },
+    AttachmentDownloaded {
+        email_id: String,
+        content_hash: String,
+        user: String,
+    },
+}
+
+pub trait EventBus: Send + Sync {
+    fn emit(&self, event: Event);
+}
+
+/// Default — all events are discarded.
+struct NoopEventBus;
+impl EventBus for NoopEventBus {
+    fn emit(&self, _event: Event) {}
+}
+
+static EVENT_BUS: LazyLock<RwLock<Box<dyn EventBus>>> =
+    LazyLock::new(|| RwLock::new(Box::new(NoopEventBus)));
+
+/// Called by Pro/Enterprise at startup to replace the noop default.
+pub fn set_event_bus(bus: Box<dyn EventBus>) {
+    *EVENT_BUS.write().unwrap() = bus;
+}
+
+/// Fire-and-forget. Called by the server at key points.
+pub fn emit(event: Event) {
+    EVENT_BUS.read().unwrap().emit(event);
+}
--- a/crates/core/src/ext/mod.rs
+++ b/crates/core/src/ext/mod.rs
@@ -0,0 +1,29 @@
+//
+// Copyright (c) 2025-2026 rustmailer.com (https://rustmailer.com)
+//
+// This file is part of the Bichon Email Archiving Project
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Event bus extension point.
+//
+// Community edition: NoopEventBus — all events are discarded.
+// Pro edition: AuditEventBus — events are persisted to audit database.
+// Enterprise edition: adds SIEM webhook to the same trait impl.
+//
+// The open-source server emits events at key points (login, view, delete, search).
+// It never reads from the event bus — events are fire-and-forget.
+
+pub mod event_bus;
+pub mod text_extractor;
--- a/crates/core/src/ext/text_extractor.rs
+++ b/crates/core/src/ext/text_extractor.rs
@@ -0,0 +1,75 @@
+//
+// Copyright (c) 2025-2026 rustmailer.com (https://rustmailer.com)
+//
+// This file is part of the Bichon Email Archiving Project
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Attachment text extraction extension point.
+//
+// Community edition: NoopExtractor — no attachments are text-indexed.
+// Pro edition: PdfExtractor — extracts text from PDF, Word, etc.
+//
+// Used in: crates/core/src/envelope/extractor.rs
+
+use std::sync::{LazyLock, RwLock};
+
+pub struct ExtractedText {
+    pub text: String,
+    pub page_count: Option<u32>,
+    pub is_ocr: bool,
+}
+
+pub trait AttachmentTextExtractor: Send + Sync {
+    /// Returns None if this extractor doesn't handle the file type.
+    /// Returns Some(ExtractedText) if text was successfully extracted.
+    fn extract(&self, content_type: &str, ext: &str, bytes: &[u8]) -> Option<ExtractedText>;
+}
+
+/// Default — all attachments are skipped.
+struct NoopExtractor;
+impl AttachmentTextExtractor for NoopExtractor {
+    fn extract(&self, _ct: &str, _ext: &str, _bytes: &[u8]) -> Option<ExtractedText> {
+        None
+    }
+}
+
+static EXTRACTOR: LazyLock<RwLock<Box<dyn AttachmentTextExtractor>>> =
+    LazyLock::new(|| RwLock::new(Box::new(NoopExtractor)));
+
+/// Called by Pro/Enterprise at startup to replace the noop default.
+pub fn set_extractor(extractor: Box<dyn AttachmentTextExtractor>) {
+    *EXTRACTOR.write().unwrap() = extractor;
+}
+
+/// Attachments larger than this are skipped (10 MiB). Avoids excessive memory
+/// and CPU cost for huge files whose text is rarely useful for search.
+pub const MAX_EXTRACT_BYTES: usize = 10 * 1024 * 1024;
+
+/// Quick pre-filter: returns true for file types where text extraction may
+/// produce useful results. Avoids cloning attachment bytes for images, videos,
+/// archives, etc. when no registered extractor would handle them.
+pub fn should_try_extract(content_type: &str, ext: &str) -> bool {
+    matches!(
+        ext,
+        "pdf" | "doc" | "docx" | "xls" | "xlsx" | "ppt" | "pptx"
+            | "txt" | "rtf" | "odt" | "ods" | "odp"
+    ) || content_type.starts_with("text/")
+}
+
+/// Called by the attachment pipeline during IMAP sync.
+/// The caller should wrap this in spawn_blocking for CPU-bound extraction.
+pub fn extract_text(content_type: &str, ext: &str, bytes: &[u8]) -> Option<ExtractedText> {
+    EXTRACTOR.read().unwrap().extract(content_type, ext, bytes)
+}
--- a/crates/core/src/imap/executor.rs
+++ b/crates/core/src/imap/executor.rs
@@ -17,8 +17,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.

 use crate::account::migration::AccountModel;
-use crate::account::state::{DownloadState, FolderStatus};
-use crate::cache::imap::download::flow::{generate_uid_sequence_hashset, DEFAULT_BATCH_SIZE};
+use crate::account::state::{DownloadState, DownloadStatus, FolderStatus};
 use crate::cache::imap::mailbox::MailBox;
 use crate::envelope::extractor::extract_envelope_and_store_it;
 use crate::error::code::ErrorCode;
@@ -80,6 +79,15 @@ impl ImapExecutor {
            .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::ImapCommandFailed))
    }

+    /// Fetches new mail for a mailbox.
+    ///
+    /// When `before` is `Some(date)`, a two-step approach is used:
+    /// `UID SEARCH` to find matching UIDs (standard IMAP), then batch `UID FETCH`
+    /// for the specific UIDs. When `before` is `None`, a direct ranged
+    /// `UID FETCH {start}:*` is issued and results are streamed.
+    ///
+    /// Returns `Ok(Some(max_uid))` with the highest UID fetched, or `Ok(None)`
+    /// if no new mail was found.
    pub async fn fetch_new_mail(
        session: &mut Session<Box<dyn SessionStream>>,
        account: &AccountModel,
@@ -87,114 +95,197 @@ impl ImapExecutor {
        start_uid: u64,
        before: Option<&str>,
        token: CancellationToken,
-    ) -> BichonResult<()> {
+    ) -> BichonResult<Option<u32>> {
        assert!(start_uid > 0, "start_uid must be greater than 0");

-        let query = match before {
-            Some(date) => format!("UID {start_uid}:* BEFORE {date}"),
-            None => format!("UID {start_uid}:*"),
-        };
+        session
+            .examine(&mailbox.encoded_name())
+            .await
+            .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::ImapCommandFailed))?;

-        let uid_list = match Self::uid_search(session, &mailbox.encoded_name(), &query).await {
-            Ok(uid_list) => uid_list,
-            Err(e) => {
-                let err_msg = format!("UID search failed in [{}]: {:#?}", mailbox.name, e);
-                DownloadState::update_folder_progress(
-                    account.id,
-                    mailbox.name.clone(),
-                    0,
-                    0,
-                    FolderStatus::Failed,
-                    Some(err_msg.clone()),
-                )?;
-                DownloadState::append_session_error(account.id, err_msg)?;
-                return Err(e);
+        match before {
+            Some(date) => {
+                Self::fetch_new_mail_with_before(session, account, mailbox, start_uid, date, token)
+                    .await
            }
-        };
+            None => Self::fetch_new_mail_range(session, account, mailbox, start_uid, token).await,
+        }
+    }

-        let len = uid_list.len();
-        if len == 0 {
-            let msg = match before {
-                Some(date) => format!("No emails found before {}.", date),
-                None => "No new emails found.".into(),
-            };
+    /// Two-step approach for date-filtered incremental fetch: UID SEARCH first,
+    /// then batch UID FETCH for matching UIDs. Uses standard IMAP syntax that
+    /// works across all compliant servers.
+    async fn fetch_new_mail_with_before(
+        session: &mut Session<Box<dyn SessionStream>>,
+        account: &AccountModel,
+        mailbox: &MailBox,
+        start_uid: u64,
+        date: &str,
+        token: CancellationToken,
+    ) -> BichonResult<Option<u32>> {
+        let query = format!("UID {start_uid}:* BEFORE {date}");
+        info!(
+            "[account {}][mailbox {}] fetch_new_mail: UID SEARCH {}",
+            account.id, mailbox.name, query
+        );
+        let results = session.uid_search(&query).await.map_err(|e| {
+            let err_msg = format!("UID SEARCH failed in [{}]: {:#?}", mailbox.name, e);
+            let _ = DownloadState::append_session_error(account.id, err_msg);
+            raise_error!(format!("{:#?}", e), ErrorCode::ImapCommandFailed)
+        })?;
+
+        if results.is_empty() {
            DownloadState::update_folder_progress(
                account.id,
                mailbox.name.clone(),
                0,
                0,
                FolderStatus::Success,
-                Some(msg),
+                Some("No new emails found.".into()),
            )?;
-            return Ok(());
+            return Ok(None);
        }
-        info!(
-            "[account {}][mailbox {}] {} envelopes need to be fetched",
-            account.id, mailbox.name, len
-        );

-        let mut uid_vec: Vec<u32> = uid_list.into_iter().collect();
+        let mut uid_vec: Vec<u32> = results.into_iter().collect();
        uid_vec.sort();
-        let uid_batches = generate_uid_sequence_hashset(
-            uid_vec,
-            account.download_batch_size.unwrap_or(DEFAULT_BATCH_SIZE) as usize,
-            false,
-        );
-        let mut current_processed = 0u64;
-        let mut has_error_or_cancel = false;
-        for (index, batch) in uid_batches.into_iter().enumerate() {
+        let max_uid = uid_vec.last().copied();
+        let planned = uid_vec.len() as u64;
+        let batch_size = account.download_batch_size.unwrap_or(DEFAULT_BATCH_SIZE) as usize;
+        let uid_batches = generate_uid_sequence_hashset(uid_vec, batch_size);
+
+        DownloadState::update_folder_progress(
+            account.id,
+            mailbox.name.clone(),
+            planned,
+            0,
+            FolderStatus::Pending,
+            None,
+        )?;
+
+        let mut count = 0u64;
+        for batch in uid_batches {
            if token.is_cancelled() {
-                break;
+                DownloadState::update_session_status(
+                    account.id,
+                    DownloadStatus::Cancelled,
+                    Some("User stopped or system shutdown".to_string()),
+                )?;
+                DownloadState::update_folder_progress(
+                    account.id,
+                    mailbox.name.clone(),
+                    planned,
+                    count,
+                    FolderStatus::Cancelled,
+                    None,
+                )?;
+                return Err(raise_error!(
+                    "Stream cancelled".into(),
+                    ErrorCode::InternalError
+                ));
            }
-            match Self::uid_batch_retrieve_emails(
+            Self::uid_batch_retrieve_emails(
                session,
                account.id,
                mailbox.id,
                &batch.0,
                token.clone(),
            )
-            .await
-            {
-                Ok(_) => {
-                    current_processed += batch.1;
-                    DownloadState::update_folder_progress(
-                        account.id,
-                        mailbox.name.clone(),
-                        len as u64,
-                        current_processed,
-                        FolderStatus::Downloading,
-                        None,
-                    )?;
-                }
-                Err(e) => {
-                    let err_msg = format!("Batch {} failed: {:#?}", index, e);
-                    DownloadState::append_session_error(account.id, err_msg.clone())?;
-                    DownloadState::update_folder_progress(
-                        account.id,
-                        mailbox.name.clone(),
-                        len as u64,
-                        current_processed,
-                        FolderStatus::Failed,
-                        Some(err_msg),
-                    )?;
-                    has_error_or_cancel = true;
-                    break;
-                }
-            }
-        }
-
-        if !has_error_or_cancel {
+            .await?;
+            count += batch.1;
            DownloadState::update_folder_progress(
                account.id,
                mailbox.name.clone(),
-                len as u64,
-                current_processed,
+                planned,
+                count,
+                FolderStatus::Downloading,
+                None,
+            )?;
+        }
+
+        DownloadState::update_folder_progress(
+            account.id,
+            mailbox.name.clone(),
+            count,
+            count,
+            FolderStatus::Success,
+            None,
+        )?;
+
+        Ok(max_uid)
+    }
+
+    /// Direct ranged UID FETCH without date filtering. Streams results from
+    /// the server in a single IMAP round-trip.
+    async fn fetch_new_mail_range(
+        session: &mut Session<Box<dyn SessionStream>>,
+        account: &AccountModel,
+        mailbox: &MailBox,
+        start_uid: u64,
+        token: CancellationToken,
+    ) -> BichonResult<Option<u32>> {
+        let uid_range = format!("{start_uid}:*");
+        info!(
+            "[account {}][mailbox {}] fetch_new_mail: direct UID FETCH {}",
+            account.id, mailbox.name, uid_range
+        );
+
+        let mut stream = session
+            .uid_fetch(&uid_range, BODY_FETCH_COMMAND)
+            .await
+            .map_err(|e| {
+                let err_msg = format!("UID FETCH failed in [{}]: {:#?}", mailbox.name, e);
+                let _ = DownloadState::append_session_error(account.id, err_msg);
+                raise_error!(format!("{:#?}", e), ErrorCode::ImapCommandFailed)
+            })?;
+
+        let mut count = 0u64;
+        let mut max_uid: Option<u32> = None;
+        while let Some(fetch) = stream
+            .try_next()
+            .await
+            .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::ImapCommandFailed))?
+        {
+            if token.is_cancelled() {
+                tracing::info!("Account {}: fetch_new_mail stream interrupted.", account.id);
+                DownloadState::update_session_status(
+                    account.id,
+                    DownloadStatus::Cancelled,
+                    Some("User stopped or system shutdown".to_string()),
+                )?;
+                return Err(raise_error!(
+                    "Stream cancelled".into(),
+                    ErrorCode::InternalError
+                ));
+            }
+
+            if let Some(uid) = fetch.uid {
+                max_uid = Some(max_uid.unwrap_or(0).max(uid));
+            }
+            extract_envelope_and_store_it(fetch, account.id, mailbox.id).await?;
+            count += 1;
+        }
+
+        if count == 0 {
+            DownloadState::update_folder_progress(
+                account.id,
+                mailbox.name.clone(),
+                0,
+                0,
+                FolderStatus::Success,
+                Some("No new emails found.".into()),
+            )?;
+        } else {
+            DownloadState::update_folder_progress(
+                account.id,
+                mailbox.name.clone(),
+                count,
+                count,
                FolderStatus::Success,
                None,
            )?;
        }

-        Ok(())
+        Ok(max_uid)
    }

    pub async fn batch_retrieve_emails(
@@ -205,36 +296,23 @@ impl ImapExecutor {
        page: u64,
        page_size: u64,
        encoded_mailbox_name: &str,
-        desc: bool,
        token: CancellationToken,
+        max_uid: &mut Option<u32>,
    ) -> BichonResult<usize> {
        assert!(page > 0, "Page number must be greater than 0");
        assert!(page_size > 0, "Page size must be greater than 0");

-        let (start, end) = if desc {
-            // Fetch messages starting from the newest (descending order)
-            let end = total.saturating_sub((page - 1) * page_size);
-            if end == 0 {
-                return Ok(0);
-            }
-            // Calculate start as end - page_size + 1 to avoid off-by-one errors
-            let start = end.saturating_sub(page_size - 1).max(1);
-            (start, end)
-        } else {
-            // Fetch messages starting from the oldest (ascending order)
-            let start = (page - 1) * page_size + 1;
-            if start > total {
-                return Ok(0);
-            }
-            // Calculate end, capped by the total number of messages
-            let end = (start + page_size - 1).min(total);
-            (start, end)
-        };
+        // Fetch messages starting from the oldest (ascending order).
+        let start = (page - 1) * page_size + 1;
+        if start > total {
+            return Ok(0);
+        }
+        let end = (start + page_size - 1).min(total);

        let sequence_set = format!("{}:{}", start, end);
        info!(
-            "Fetching mailbox '{}' messages: sequence {} (page {}, page_size {}, desc={})",
-            encoded_mailbox_name, sequence_set, page, page_size, desc
+            "Fetching mailbox '{}' messages: sequence {} (page {}, page_size {})",
+            encoded_mailbox_name, sequence_set, page, page_size
        );

        let mut stream = session
@@ -255,6 +333,9 @@ impl ImapExecutor {
                    ErrorCode::InternalError
                ));
            }
+            if let Some(uid) = fetch.uid {
+                *max_uid = Some((*max_uid).unwrap_or(0).max(uid));
+            }
            extract_envelope_and_store_it(fetch, account_id, mailbox_id).await?;
            count += 1;
        }
@@ -289,9 +370,178 @@ impl ImapExecutor {
        Ok(())
    }

+    /// Fetches the raw RFC822 body of a single message by UID.
+    ///
+    /// Selects (read-only) the given mailbox and issues `UID FETCH <uid> (BODY.PEEK[])`.
+    /// Used for on-demand self-healing when an indexed message's content blob is missing.
+    /// Returns the raw bytes, or an error if the message cannot be retrieved.
+    pub async fn fetch_single_message_body(
+        session: &mut Session<Box<dyn SessionStream>>,
+        encoded_mailbox_name: &str,
+        uid: u32,
+    ) -> BichonResult<Vec<u8>> {
+        session
+            .examine(encoded_mailbox_name)
+            .await
+            .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::ImapCommandFailed))?;
+
+        let mut stream = session
+            .uid_fetch(uid.to_string(), BODY_FETCH_COMMAND)
+            .await
+            .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::ImapCommandFailed))?;
+
+        let fetch = stream
+            .try_next()
+            .await
+            .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::ImapCommandFailed))?
+            .ok_or_else(|| {
+                raise_error!(
+                    format!("UID {uid} not found on IMAP server"),
+                    ErrorCode::ResourceNotFound
+                )
+            })?;
+
+        let body = fetch
+            .body()
+            .ok_or_else(|| {
+                raise_error!(
+                    format!("No body returned for UID {uid}"),
+                    ErrorCode::ImapUnexpectedResult
+                )
+            })?
+            .to_vec();
+
+        // // Drain any remaining items so the stream is fully consumed before reuse.
+        // while stream
+        //     .try_next()
+        //     .await
+        //     .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::ImapCommandFailed))?
+        //     .is_some()
+        // {}
+
+        Ok(body)
+    }
+
    pub async fn create_connection(
        account_id: u64,
    ) -> BichonResult<Session<Box<dyn SessionStream>>> {
        ImapConnectionManager::build(account_id).await
    }
 }
+
+pub const DEFAULT_BATCH_SIZE: u32 = 30;
+
+/// Compresses a sorted list of UIDs into an IMAP sequence-set string.
+/// Consecutive UIDs become ranges (e.g. `1:5`), non-consecutive are
+/// comma-separated (e.g. `1:5,10,12:15`).
+pub fn compress_uid_list(nums: Vec<u32>) -> String {
+    if nums.is_empty() {
+        return String::new();
+    }
+
+    let mut sorted_nums = nums;
+    sorted_nums.sort();
+
+    let mut result = Vec::new();
+    let mut current_range_start = sorted_nums[0];
+    let mut current_range_end = sorted_nums[0];
+
+    for &n in sorted_nums.iter().skip(1) {
+        if n == current_range_end + 1 {
+            current_range_end = n;
+        } else {
+            if current_range_start == current_range_end {
+                result.push(current_range_start.to_string());
+            } else {
+                result.push(format!("{}:{}", current_range_start, current_range_end));
+            }
+            current_range_start = n;
+            current_range_end = n;
+        }
+    }
+
+    if current_range_start == current_range_end {
+        result.push(current_range_start.to_string());
+    } else {
+        result.push(format!("{}:{}", current_range_start, current_range_end));
+    }
+
+    result.join(",")
+}
+
+/// Splits a sorted list of unique UIDs into compressed sequence-set batches.
+/// Returns `Vec<(sequence_set_string, batch_count)>`.
+pub fn generate_uid_sequence_hashset(
+    unique_nums: Vec<u32>,
+    chunk_size: usize,
+) -> Vec<(String, u64)> {
+    assert!(!unique_nums.is_empty());
+
+    let mut result = Vec::new();
+    let nums = unique_nums;
+
+    for chunk in nums.chunks(chunk_size) {
+        let size = chunk.len() as u64;
+        let compressed = compress_uid_list(chunk.to_vec());
+        result.push((compressed, size));
+    }
+
+    result
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    // ── compress_uid_list ──────────────────────────────────────────
+
+    #[test]
+    fn compress_empty() {
+        assert_eq!(compress_uid_list(vec![]), "");
+    }
+
+    #[test]
+    fn compress_single_uid() {
+        assert_eq!(compress_uid_list(vec![42]), "42");
+    }
+
+    #[test]
+    fn compress_consecutive_range() {
+        assert_eq!(compress_uid_list(vec![1, 2, 3, 4, 5]), "1:5");
+    }
+
+    #[test]
+    fn compress_mixed_ranges() {
+        assert_eq!(
+            compress_uid_list(vec![1, 2, 3, 5, 7, 8, 9, 10]),
+            "1:3,5,7:10"
+        );
+    }
+
+    #[test]
+    fn compress_gap_at_boundary() {
+        assert_eq!(compress_uid_list(vec![1, 2, 4, 5]), "1:2,4:5");
+    }
+
+    // ── generate_uid_sequence_hashset ──────────────────────────────
+
+    #[test]
+    fn batch_single_chunk() {
+        let batches = generate_uid_sequence_hashset(vec![1, 2, 3], 10);
+        assert_eq!(batches.len(), 1);
+        assert_eq!(batches[0].0, "1:3");
+        assert_eq!(batches[0].1, 3);
+    }
+
+    #[test]
+    fn batch_multiple_chunks() {
+        let batches = generate_uid_sequence_hashset(vec![1, 2, 3, 4, 5], 2);
+        assert_eq!(batches.len(), 3);
+        assert_eq!(batches[0].0, "1:2");
+        assert_eq!(batches[0].1, 2);
+        assert_eq!(batches[1].0, "3:4");
+        assert_eq!(batches[1].1, 2);
+        assert_eq!(batches[2].0, "5");
+        assert_eq!(batches[2].1, 1);
+    }
+}
--- a/crates/core/src/import/mod.rs
+++ b/crates/core/src/import/mod.rs
@@ -105,6 +105,7 @@ impl ImportEmls {
                    unseen: None,
                    uid_next: None,
                    uid_validity: None,
+                    highest_uid: None,
                };
                let mailbox_id = mailbox.id;
                // Upsert the mailbox, creating it if it doesn't exist
--- a/crates/core/src/lib.rs
+++ b/crates/core/src/lib.rs
@@ -1,4 +1,5 @@
 pub mod account;
+pub mod ext;
 pub mod admin;
 pub mod autoconfig;
 pub mod cache;
--- a/crates/core/src/mailbox/list.rs
+++ b/crates/core/src/mailbox/list.rs
@@ -157,8 +157,13 @@ async fn fetch_remote_with_progress(account_id: u64) -> BichonResult<Vec<MailBox

        mailbox.account_id = account_id;
        mailbox.id = create_hash(account_id, &mailbox.name);
+        // Use STATUS instead of EXAMINE: gets MESSAGES/UNSEEN/UIDNEXT/UIDVALIDITY
+        // without selecting the mailbox, avoiding context switches.
        let mx = session
-            .examine(mailbox_name.as_str())
+            .status(
+                mailbox_name.as_str(),
+                "(MESSAGES UNSEEN UIDNEXT UIDVALIDITY)",
+            )
            .await
            .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::ImapCommandFailed))?;
        mailbox.exists = mx.exists;
@@ -205,8 +210,13 @@ pub async fn convert_names_to_mailboxes(

        mailbox.account_id = account_id;
        mailbox.id = create_hash(account_id, &mailbox.name);
+        // Use STATUS instead of EXAMINE: gets MESSAGES/UNSEEN/UIDNEXT/UIDVALIDITY
+        // without selecting the mailbox, avoiding context switches.
        let mx = session
-            .examine(mailbox_name.as_str())
+            .status(
+                mailbox_name.as_str(),
+                "(MESSAGES UNSEEN UIDNEXT UIDVALIDITY)",
+            )
            .await
            .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::ImapCommandFailed))?;
        mailbox.exists = mx.exists;
--- a/crates/core/src/message/content.rs
+++ b/crates/core/src/message/content.rs
@@ -22,6 +22,7 @@ use crate::envelope::extractor::{extract_envelope_from_nested_message, reattach_
 use crate::error::code::ErrorCode;
 use crate::store::envelope::Envelope;
 use crate::utils::compute_content_hash;
+use crate::utils::html::block_remote_content;
 use crate::{error::BichonResult, raise_error};
 use mail_parser::{MessageParser, MimeHeaders};
 //use poem_openapi::Object;
@@ -46,6 +47,13 @@ pub struct AttachmentInfo {
    /// Hash of the content.
    pub content_hash: String,
    pub is_message: bool,
+    /// Text extracted from the attachment body (Pro/Enterprise feature).
+    /// Populated during IMAP sync; None for inline attachments and unsupported file types.
+    pub extracted_text: Option<String>,
+    /// Page count reported by the extractor, if any.
+    pub extracted_page_count: Option<u32>,
+    /// Whether the extracted text came from OCR.
+    pub extracted_is_ocr: bool,
 }

 impl AttachmentInfo {
@@ -142,6 +150,9 @@ pub struct FullMessageContent {
    pub html: Option<String>,
    // all Attachments include inline attachments
    pub attachments: Option<Vec<AttachmentInfo>>,
+    /// True when remote content (http/https URLs) was detected and stripped from html.
+    #[serde(default)]
+    pub has_remote_content: bool,
 }

 #[derive(Clone, Debug, Default, Eq, PartialEq, Deserialize, Serialize)]
@@ -155,11 +166,15 @@ pub struct FullNestedMessageContent {
    pub attachments: Option<Vec<AttachmentInfo>>,
    /// Metadata for the email envelope.
    pub envelope: Envelope,
+    /// True when remote content (http/https URLs) was detected and stripped from html.
+    #[serde(default)]
+    pub has_remote_content: bool,
 }

 pub fn retrieve_email_content(
    account_id: u64,
    envelope_id: String,
+    block_remote: bool,
 ) -> BichonResult<FullMessageContent> {
    AccountModel::check_account_exists(account_id)?;
    let (envelope, eml) = reattach_eml_content(account_id, envelope_id)?;
@@ -214,19 +229,31 @@ pub fn retrieve_email_content(
        let is_message = attachment.is_message();
        let content_hash = compute_content_hash(attachment.contents());
        attachments.push(AttachmentInfo {
-            filename: filename.or(Some(content_hash.clone())), //  Fallback to content_hash as the default filename if it is not provided.
+            filename: filename.or(Some(content_hash.clone())),
            size: attachment.contents().len(),
            inline,
            file_type,
            is_message,
            content_hash,
            content_id: attachment.content_id().map(Into::into),
+            extracted_text: None,
+            extracted_page_count: None,
+            extracted_is_ocr: false,
        });
    }
+    let mut has_remote_content = false;
+    if let Some(ref html_body) = html {
+        let filtered = block_remote_content(html_body);
+        has_remote_content = *html_body != filtered;
+        if block_remote {
+            html = Some(filtered);
+        }
+    }
    Ok(FullMessageContent {
        text,
        html,
        attachments: Some(attachments),
+        has_remote_content,
    })
 }

@@ -234,6 +261,7 @@ pub fn retrieve_nested_eml_content(
    account_id: u64,
    envelope_id: String,
    content_hash: &str,
+    block_remote: bool,
 ) -> BichonResult<FullNestedMessageContent> {
    let (_, eml) = reattach_eml_content(account_id, envelope_id)?;
    let parent_message = MessageParser::default().parse(&eml).ok_or_else(|| {
@@ -302,22 +330,34 @@ pub fn retrieve_nested_eml_content(
            filename: attachment
                .attachment_name()
                .map(|n| n.to_string())
-                .or(Some(content_hash.clone())), // Fallback to content_hash as the default filename if it is not provided.
+                .or(Some(content_hash.clone())),
            size: attachment.contents().len(),
            inline: is_inline,
            file_type,
            content_hash,
            is_message: attachment.is_message(),
            content_id: cid.map(Into::into),
+            extracted_text: None,
+            extracted_page_count: None,
+            extracted_is_ocr: false,
        });
    }

    let envelope = extract_envelope_from_nested_message(nested_message, account_id)?;

+    let mut has_remote_content = false;
+    if let Some(ref html_body) = html {
+        let filtered = block_remote_content(html_body);
+        has_remote_content = *html_body != filtered;
+        if block_remote {
+            html = Some(filtered);
+        }
+    }
    Ok(FullNestedMessageContent {
        text,
        html,
        attachments: Some(attachments),
        envelope,
+        has_remote_content,
    })
 }
--- a/crates/core/src/message/search.rs
+++ b/crates/core/src/message/search.rs
@@ -45,6 +45,14 @@ pub struct EmailSearchFilter {
    pub bcc: Option<String>,
    pub since: Option<i64>,
    pub before: Option<i64>,
+    /// Lower bound (inclusive) on the IMAP server INTERNALDATE timestamp.
+    pub internal_date_since: Option<i64>,
+    /// Upper bound (inclusive) on the IMAP server INTERNALDATE timestamp.
+    pub internal_date_before: Option<i64>,
+    /// Lower bound (inclusive) on Bichon's archival (ingest) timestamp.
+    pub ingest_since: Option<i64>,
+    /// Upper bound (inclusive) on Bichon's archival (ingest) timestamp.
+    pub ingest_before: Option<i64>,
    pub account_ids: Option<HashSet<u64>>,
    pub mailbox_ids: Option<HashSet<u64>>,
    pub min_size: Option<u64>,
@@ -64,6 +72,14 @@ pub enum SortBy {
    #[default]
    DATE,
    SIZE,
+    /// Sort by the IMAP server INTERNALDATE timestamp.
+    #[serde(rename = "INTERNAL_DATE")]
+    #[cfg_attr(feature = "web-api", oai(rename = "INTERNAL_DATE"))]
+    InternalDate,
+    /// Sort by Bichon's archival (ingest) timestamp.
+    #[serde(rename = "INGEST_AT")]
+    #[cfg_attr(feature = "web-api", oai(rename = "INGEST_AT"))]
+    IngestAt,
 }

 #[derive(Debug, Clone, Default, Eq, PartialEq, Serialize, Deserialize)]
--- a/crates/core/src/migrate/store.rs
+++ b/crates/core/src/migrate/store.rs
@@ -114,6 +114,9 @@ pub fn detach_attachments_standalone(
            content_id: att.content_id().map(|id| id.to_string()),
            content_hash,
            is_message: att.is_message(),
+            extracted_text: None,
+            extracted_page_count: None,
+            extracted_is_ocr: false,
        });
    }

@@ -457,16 +460,10 @@ impl NewIndexWriter {
            ("attachment", &mut self.attachment_writer),
        ] {
            if let Some(writer) = writer_opt.as_mut() {
-                let reader = writer
+                let seg_ids = writer
                    .index()
-                    .reader()
+                    .searchable_segment_ids()
                    .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;
-                let seg_ids: Vec<_> = reader
-                    .searcher()
-                    .segment_readers()
-                    .iter()
-                    .map(|r| r.segment_id())
-                    .collect();
                println!("merging {} {} segments...", seg_ids.len(), name);
                if seg_ids.len() > 1 {
                    let _ = writer.merge(&seg_ids);
--- a/crates/core/src/store/blob.rs
+++ b/crates/core/src/store/blob.rs
@@ -18,7 +18,7 @@

 use crate::{
    common::signal::SIGNAL_MANAGER,
-    envelope::extractor::reattach_eml_content,
+    envelope::extractor::reattach_eml_content_self_healing,
    error::{code::ErrorCode, BichonResult},
    settings::dir::DATA_DIR_MANAGER,
 };
@@ -68,7 +68,9 @@ impl BlobManager {
                }
            }
            Err(e) => tracing::error!("Fjall email_ks error: {:?}", e),
-            _ => {}
+            Ok(true) => {
+                tracing::debug!("Email blob already exists (dedup): {}", &email_hash);
+            }
        }

        if let Some(attachments) = eml.attachments {
@@ -80,7 +82,9 @@ impl BlobManager {
                        }
                    }
                    Err(e) => tracing::error!("Fjall attach_ks error: {:?}", e),
-                    _ => {}
+                    Ok(true) => {
+                        tracing::debug!("Attachment blob already exists (dedup): {}", &a_hash);
+                    }
                }
            }
        }
@@ -145,9 +149,18 @@ impl BlobManager {
                    res = receiver.recv() => {
                        match res {
                            Some(eml) => {
-                                Self::process_detached_email(eml, &email_ks, &attach_ks);
+                                let mut batch = vec![eml];
                                while let Ok(next_eml) = receiver.try_recv() {
-                                    Self::process_detached_email(next_eml, &email_ks, &attach_ks);
+                                    batch.push(next_eml);
+                                }
+                                let email_ks = email_ks.clone();
+                                let attach_ks = attach_ks.clone();
+                                if let Err(e) = tokio::task::spawn_blocking(move || {
+                                    for eml in batch {
+                                        Self::process_detached_email(eml, &email_ks, &attach_ks);
+                                    }
+                                }).await {
+                                    tracing::error!("BlobManager: spawn_blocking join error: {:#?}", e);
                                }
                            }
                            None => {
@@ -158,16 +171,25 @@ impl BlobManager {
                    }
                    _ = shutdown.recv() => {
                        receiver.close();
-                        let remaining = receiver.len();
+                        let mut remaining = Vec::new();
+                        while let Some(eml) = receiver.recv().await {
+                            remaining.push(eml);
+                        }
                        tracing::info!(
                            "BlobManager: Shutdown signal received. Processing {} remaining tasks...",
-                            remaining
+                            remaining.len()
                        );
-
-                        while let Some(eml) = receiver.recv().await {
-                            Self::process_detached_email(eml, &email_ks, &attach_ks);
+                        if !remaining.is_empty() {
+                            let email_ks = email_ks.clone();
+                            let attach_ks = attach_ks.clone();
+                            if let Err(e) = tokio::task::spawn_blocking(move || {
+                                for eml in remaining {
+                                    Self::process_detached_email(eml, &email_ks, &attach_ks);
+                                }
+                            }).await {
+                                tracing::error!("BlobManager: shutdown spawn_blocking join error: {:#?}", e);
+                            }
                        }
-
                        tracing::info!("BlobManager: All remaining tasks processed. Closing Fjall.");
                        break;
                    }
@@ -185,7 +207,9 @@ impl BlobManager {
    }

    pub async fn queue(&self, email: DetachedEmail) {
-        let _ = self.sender.send(email).await;
+        if let Err(e) = self.sender.send(email).await {
+          tracing::error!("BlobManager channel closed, email lost: {:#?}", e);
+        }
    }

    pub fn get_email(&self, content_hash: &str) -> BichonResult<Option<Bytes>> {
@@ -226,7 +250,13 @@ impl BlobManager {
    }
 }

-pub fn get_reader(account_id: u64, eid: String) -> BichonResult<Cursor<Bytes>> {
-    let (_, data) = reattach_eml_content(account_id, eid)?;
+/// Returns a reader over the raw EML for an indexed message.
+///
+/// If the message's content blob is missing from the blob store, it is fetched
+/// on demand from the IMAP server, persisted, and returned (self-healing). The
+/// underlying "content not found" error is only surfaced if that on-demand
+/// fetch itself fails.
+pub async fn get_reader(account_id: u64, eid: String) -> BichonResult<Cursor<Bytes>> {
+    let (_, data) = reattach_eml_content_self_healing(account_id, eid).await?;
    Ok(Cursor::new(data))
 }
--- a/crates/core/src/store/tantivy/attachment.rs
+++ b/crates/core/src/store/tantivy/attachment.rs
@@ -38,8 +38,8 @@ use crate::{
    store::tantivy::{
        fatal_commit,
        fields::{
-            F_ATTACHMENT_CATEGORY, F_ATTACHMENT_CONTENT_TYPE, F_ATTACHMENT_EXT, F_DATE, F_SIZE,
-            F_TAGS,
+            F_ATTACHMENT_CATEGORY, F_ATTACHMENT_CONTENT_TYPE, F_ATTACHMENT_EXT, F_DATE,
+            F_INGEST_AT, F_SIZE, F_TAGS,
        },
        model::{extract_senders, AttachmentModel},
        schema::SchemaTools,
@@ -154,7 +154,11 @@ impl IndexManager {
                                        "Tantivy: Reached threshold ({} docs), committing...",
                                        pending_count
                                    );
-                                    fatal_commit(&mut writer);
+                                    tokio::task::block_in_place(|| fatal_commit(&mut writer));
+                                    tracing::debug!(
+                                        "Tantivy attach: committed {} docs, pending reset to 0",
+                                        pending_count
+                                    );
                                    pending_count = 0;
                                    commit_interval.reset();
                                }
@@ -163,7 +167,7 @@ impl IndexManager {
                                tracing::info!("Tantivy: Receiver closed. Finalizing...");
                                if pending_count > 0 {
                                    let mut writer = writer.lock().await;
-                                    fatal_commit(&mut writer);
+                                    tokio::task::block_in_place(|| fatal_commit(&mut writer));
                                }
                                break;
                            },
@@ -172,16 +176,19 @@ impl IndexManager {
                    _ = commit_interval.tick() => {
                        if pending_count > 0 {
                            let mut writer = writer.lock().await;
-                            fatal_commit(&mut writer);
+                            tracing::debug!(
+                                "Tantivy attach: periodic commit ({} docs pending)",
+                                pending_count
+                            );
+                            tokio::task::block_in_place(|| fatal_commit(&mut writer));
                            pending_count = 0;
-                            tracing::debug!("Tantivy: Periodic commit finished.");
                        }
                    }
                    _ = shutdown.recv() => {
                        tracing::info!("Tantivy: Shutdown signal received. Performing final commit...");
                        if pending_count > 0 {
                            let mut writer = writer.lock().await;
-                            fatal_commit(&mut writer);
+                            tokio::task::block_in_place(|| fatal_commit(&mut writer));
                        }
                        tracing::info!("Tantivy: Shutdown cleanup complete.");
                        break;
@@ -864,6 +871,30 @@ impl IndexManager {
                    .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;
                attachment_docs = size_docs.into_iter().map(|(_, addr)| addr).collect();
            }
+            // Attachments carry no IMAP INTERNALDATE; fall back to the
+            // attachment's own date field so the sort remains well defined.
+            SortBy::InternalDate => {
+                let date_docs: Vec<(Option<i64>, DocAddress)> = searcher
+                    .search(
+                        &query,
+                        &TopDocs::with_limit(page_size as usize)
+                            .and_offset(offset as usize)
+                            .order_by_fast_field(F_DATE, order),
+                    )
+                    .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;
+                attachment_docs = date_docs.into_iter().map(|(_, addr)| addr).collect();
+            }
+            SortBy::IngestAt => {
+                let ingest_at_docs: Vec<(Option<i64>, DocAddress)> = searcher
+                    .search(
+                        &query,
+                        &TopDocs::with_limit(page_size as usize)
+                            .and_offset(offset as usize)
+                            .order_by_fast_field(F_INGEST_AT, order),
+                    )
+                    .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;
+                attachment_docs = ingest_at_docs.into_iter().map(|(_, addr)| addr).collect();
+            }
        }

        let mut result = Vec::new();
--- a/crates/core/src/store/tantivy/dedup.rs
+++ b/crates/core/src/store/tantivy/dedup.rs
@@ -255,11 +255,22 @@ fn dedup_account(
        // uidvalidity, which is required for correct incremental sync.
        entries.sort_by_key(|e| std::cmp::Reverse(e.ingest_at));

-        eprintln!(
-            "DEBUG Phase2: key={_key:?} kept={} deleting={}",
-            entries[0].email_id,
+        tracing::debug!(
+            "dedup: account={} mailbox={} hash={}: {} copies, keeping eid={} ingest_at={}, deleting {}",
+            account_id,
+            _key.0,
+            &_key.1,
+            entries.len(),
+            &entries[0].email_id,
+            entries[0].ingest_at,
            entries.len() - 1
        );
+
+        // eprintln!(
+        //     "DEBUG Phase2: key={_key:?} kept={} deleting={}",
+        //     entries[0].email_id,
+        //     entries.len() - 1
+        // );
        // Keep entries[0], soft-delete everything else via term query on f_id
        for entry in &entries[1..] {
            eprintln!(
--- a/crates/core/src/store/tantivy/envelope.rs
+++ b/crates/core/src/store/tantivy/envelope.rs
@@ -42,8 +42,8 @@ use crate::{
            attachment::ATTACHMENT_MANAGER,
            fatal_commit,
            fields::{
-                F_ACCOUNT_ID, F_DATE, F_FROM, F_ID, F_REGULAR_ATTACHMENT_COUNT, F_SIZE, F_TAGS,
-                F_THREAD_ID, F_UID,
+                F_ACCOUNT_ID, F_DATE, F_FROM, F_ID, F_INGEST_AT, F_INTERNAL_DATE,
+                F_REGULAR_ATTACHMENT_COUNT, F_SIZE, F_TAGS, F_THREAD_ID, F_UID,
            },
            model::{extract_contacts, EnvelopeWithAttachments},
            schema::SchemaTools,
@@ -169,7 +169,11 @@ impl IndexManager {
                                        "Tantivy: Reached threshold ({} docs), committing...",
                                        pending_count
                                    );
-                                    fatal_commit(&mut writer);
+                                    tokio::task::block_in_place(|| fatal_commit(&mut writer));
+                                    tracing::debug!(
+                                        "Tantivy: committed {} docs, pending reset to 0",
+                                        pending_count
+                                    );
                                    pending_count = 0;
                                    commit_interval.reset();
                                }
@@ -178,7 +182,7 @@ impl IndexManager {
                                tracing::info!("Tantivy: Receiver closed. Finalizing...");
                                if pending_count > 0 {
                                    let mut writer = writer.lock().await;
-                                    fatal_commit(&mut writer);
+                                    tokio::task::block_in_place(|| fatal_commit(&mut writer));
                                }
                                break;
                            },
@@ -187,16 +191,19 @@ impl IndexManager {
                    _ = commit_interval.tick() => {
                        if pending_count > 0 {
                            let mut writer = writer.lock().await;
-                            fatal_commit(&mut writer);
+                            tracing::debug!(
+                                "Tantivy: periodic commit ({} docs pending)",
+                                pending_count
+                            );
+                            tokio::task::block_in_place(|| fatal_commit(&mut writer));
                            pending_count = 0;
-                            tracing::debug!("Tantivy: Periodic commit finished.");
                        }
                    }
                    _ = shutdown.recv() => {
                        tracing::info!("Tantivy: Shutdown signal received. Performing final commit...");
                        if pending_count > 0 {
                            let mut writer = writer.lock().await;
-                            fatal_commit(&mut writer);
+                            tokio::task::block_in_place(|| fatal_commit(&mut writer));
                        }
                        tracing::info!("Tantivy: Shutdown cleanup complete.");
                        break;
@@ -214,7 +221,9 @@ impl IndexManager {
    }

    pub async fn queue(&self, doc: TantivyDocument) {
-        let _ = self.sender.send(doc).await;
+        if let Err(e) = self.sender.send(doc).await {
+            tracing::warn!(error = %e, "Failed to queue document into Tantivy writer channel");
+        }
    }

    fn open_or_create_index(index_dir: &PathBuf) -> Index {
@@ -457,6 +466,40 @@ impl IndexManager {
            subqueries.push((Occur::Must, Box::new(q)));
        }

+        let start_bound = if let Some(from) = filter.internal_date_since {
+            Bound::Included(Term::from_field_i64(f.f_internal_date, from))
+        } else {
+            Bound::Unbounded
+        };
+
+        let end_bound = if let Some(to) = filter.internal_date_before {
+            Bound::Included(Term::from_field_i64(f.f_internal_date, to))
+        } else {
+            Bound::Unbounded
+        };
+
+        if start_bound != Bound::Unbounded || end_bound != Bound::Unbounded {
+            let q = RangeQuery::new(start_bound, end_bound);
+            subqueries.push((Occur::Must, Box::new(q)));
+        }
+
+        let start_bound = if let Some(from) = filter.ingest_since {
+            Bound::Included(Term::from_field_i64(f.f_ingest_at, from))
+        } else {
+            Bound::Unbounded
+        };
+
+        let end_bound = if let Some(to) = filter.ingest_before {
+            Bound::Included(Term::from_field_i64(f.f_ingest_at, to))
+        } else {
+            Bound::Unbounded
+        };
+
+        if start_bound != Bound::Unbounded || end_bound != Bound::Unbounded {
+            let q = RangeQuery::new(start_bound, end_bound);
+            subqueries.push((Occur::Must, Box::new(q)));
+        }
+
        if let Some(account_ids) = filter.account_ids {
            let mut should_queries: Vec<(Occur, Box<dyn Query>)> = Vec::new();
            for id in account_ids {
@@ -654,7 +697,15 @@ impl IndexManager {
        let agg_res = searcher
            .search(query.as_ref(), &collector)
            .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;
-        Ok(Self::extract_max_uid(&agg_res))
+        let result = Self::extract_max_uid(&agg_res);
+        tracing::debug!(
+            "[account {}][mailbox {}] get_max_uid = {:?} (num_docs in searcher = {})",
+            account_id,
+            mailbox_id,
+            result,
+            searcher.num_docs()
+        );
+        Ok(result)
    }

    pub fn get_account_stats(&self, account_id: u64) -> BichonResult<AccountStats> {
@@ -733,7 +784,11 @@ impl IndexManager {
            .await?;

        if !eml_content_hashes.is_empty() || !attachments_content_hashes.is_empty() {
-            self.cleanup_unused_content(eml_content_hashes, attachments_content_hashes)?;
+            self.cleanup_unused_content(
+                &mut writer,
+                eml_content_hashes,
+                attachments_content_hashes,
+            )?;
        }
        Ok(())
    }
@@ -772,7 +827,11 @@ impl IndexManager {
            .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;

        if !eml_content_hashes.is_empty() || !attachments_content_hashes.is_empty() {
-            self.cleanup_unused_content(eml_content_hashes, attachments_content_hashes)?;
+            self.cleanup_unused_content(
+                &mut writer,
+                eml_content_hashes,
+                attachments_content_hashes,
+            )?;
        }
        Ok(())
    }
@@ -817,9 +876,18 @@ impl IndexManager {

    fn cleanup_unused_content(
        &self,
+        writer: &mut IndexWriter,
        eml_content_hashes: HashSet<String>,
        attachments_content_hashes: HashSet<String>,
    ) -> BichonResult<()> {
+        // Reference-count barrier: commit the writer and reload the reader so the
+        // `Count` below is evaluated against a fully committed, freshly-reloaded
+        // index state. Without this, an envelope that shares a content hash but
+        // is still sitting uncommitted in the writer buffer (e.g. added by the
+        // background ingest task before this delete acquired the writer lock)
+        // would be invisible to the searcher, the count would read 0, and a
+        // still-referenced blob would be deleted.
+        fatal_commit(writer);
        let searcher = self.create_searcher()?;
        let fields = SchemaTools::email_fields();
        let mut eml: HashSet<String> = HashSet::new();
@@ -836,11 +904,10 @@ impl IndexManager {
                eml.insert(content_hash);
            }
        }
-
        let mut attachments: HashSet<String> = HashSet::new();
        for content_hash in attachments_content_hashes {
            // Check if any other emails still reference this content hash
-            let hash_term = Term::from_field_text(fields.f_content_hash, &content_hash);
+            let hash_term = Term::from_field_text(fields.f_attachment_content_hash, &content_hash);
            let hash_query = TermQuery::new(hash_term, IndexRecordOption::Basic);
            let count = searcher
                .search(&hash_query, &Count)
@@ -900,7 +967,11 @@ impl IndexManager {
            .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;

        if !eml_content_hashes.is_empty() || !attachments_content_hashes.is_empty() {
-            self.cleanup_unused_content(eml_content_hashes, attachments_content_hashes)?;
+            self.cleanup_unused_content(
+                &mut writer,
+                eml_content_hashes,
+                attachments_content_hashes,
+            )?;
        }

        Ok(())
@@ -1141,6 +1212,31 @@ impl IndexManager {
                    .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;
                mailbox_docs = size_docs.into_iter().map(|(_, addr)| addr).collect();
            }
+            SortBy::InternalDate => {
+                let internal_date_docs: Vec<(Option<i64>, DocAddress)> = searcher
+                    .search(
+                        &query,
+                        &TopDocs::with_limit(page_size as usize)
+                            .and_offset(offset as usize)
+                            .order_by_fast_field(F_INTERNAL_DATE, order),
+                    )
+                    .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;
+                mailbox_docs = internal_date_docs
+                    .into_iter()
+                    .map(|(_, addr)| addr)
+                    .collect();
+            }
+            SortBy::IngestAt => {
+                let ingest_at_docs: Vec<(Option<i64>, DocAddress)> = searcher
+                    .search(
+                        &query,
+                        &TopDocs::with_limit(page_size as usize)
+                            .and_offset(offset as usize)
+                            .order_by_fast_field(F_INGEST_AT, order),
+                    )
+                    .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?;
+                mailbox_docs = ingest_at_docs.into_iter().map(|(_, addr)| addr).collect();
+            }
        }

        let mut result = Vec::new();
--- a/crates/core/src/utils/html.rs
+++ b/crates/core/src/utils/html.rs
@@ -17,9 +17,63 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.


+use regex::Regex;
 use std::panic;
+use std::sync::LazyLock;
 use tracing::error;

+/// Removes remote content references from HTML email body.
+///
+/// Strips attributes that load content from http:// or https:// URLs,
+/// keeping data: URIs and cid: references intact. Does NOT affect
+/// navigation links (<a href>).
+pub fn block_remote_content(html: &str) -> String {
+    let mut result = html.to_string();
+
+    // 1. Strip src, poster, data attributes with remote URLs.
+    //    These always load content regardless of the tag.
+    static SRC_ATTR_RE: LazyLock<Regex> = LazyLock::new(|| {
+        Regex::new(r#"(?i)\s+(src|poster|data)\s*=\s*["'][^"']*(?:https?://|//)[^"']*["']"#).unwrap()
+    });
+    result = SRC_ATTR_RE.replace_all(&result, "").to_string();
+
+    // 2. Strip srcset attributes with remote URLs.
+    static SRCSET_ATTR_RE: LazyLock<Regex> = LazyLock::new(|| {
+        Regex::new(r#"(?i)\s+srcset\s*=\s*["'][^"']*(?:https?://|//)[^"']*["']"#).unwrap()
+    });
+    result = SRCSET_ATTR_RE.replace_all(&result, "").to_string();
+
+    // 3. Strip href on <link> tags (stylesheets), never <a> links.
+    static LINK_HREF_RE: LazyLock<Regex> = LazyLock::new(|| {
+        Regex::new(r#"(?i)(<link\b[^>]*)\s+href\s*=\s*["'][^"']*(?:https?://|//)[^"']*["']"#).unwrap()
+    });
+    result = LINK_HREF_RE.replace_all(&result, "$1").to_string();
+
+    // 4. Strip CSS url() references with remote URLs in inline styles.
+    static CSS_URL_RE: LazyLock<Regex> = LazyLock::new(|| {
+        Regex::new(r#"(?i)url\(\s*["']?\s*(?:https?://|//)[^)"'\s]*\s*["']?\s*\)"#).unwrap()
+    });
+    result = CSS_URL_RE.replace_all(&result, "").to_string();
+
+    // 5. Strip @import url(...) with remote URLs inside <style> blocks.
+    static IMPORT_URL_RE: LazyLock<Regex> = LazyLock::new(|| {
+        Regex::new(
+            r#"(?i)@import\s+url\(\s*["']?\s*(?:https?://|//)[^)"'\s]*\s*["']?\s*\)\s*;"#,
+        )
+        .unwrap()
+    });
+    result = IMPORT_URL_RE.replace_all(&result, "").to_string();
+
+    // 6. Strip background attribute on <body> with remote URLs.
+    static BODY_BG_RE: LazyLock<Regex> = LazyLock::new(|| {
+        Regex::new(r#"(?i)(<body\b[^>]*)\s+background\s*=\s*["'][^"']*(?:https?://|//)[^"']*["']"#)
+            .unwrap()
+    });
+    result = BODY_BG_RE.replace_all(&result, "$1").to_string();
+
+    result
+}
+
 pub fn extract_text(html: String) -> String {
    let result = panic::catch_unwind(|| {
        html2text::config::plain()
@@ -88,4 +142,132 @@ mod tests {
        let text = extract_text(html);
        assert!(text.contains("Click here"));
    }
+
+    mod block_remote {
+        use super::*;
+
+        #[test]
+        fn strips_img_src_http() {
+            let html = r#"<img src="https://tracker.example.com/pixel.gif" alt="x">"#;
+            let result = block_remote_content(html);
+            assert!(!result.contains("https://tracker.example.com"));
+            assert!(result.contains("alt=")); // other attrs preserved
+        }
+
+        #[test]
+        fn strips_img_src_protocol_relative() {
+            let html = r#"<img src="//tracker.example.com/pixel.gif">"#;
+            let result = block_remote_content(html);
+            assert!(!result.contains("//tracker.example.com"));
+        }
+
+        #[test]
+        fn preserves_data_uri() {
+            let html = r#"<img src="data:image/png;base64,ABC123" alt="embedded">"#;
+            let result = block_remote_content(html);
+            assert!(result.contains("data:image/png;base64,ABC123"));
+        }
+
+        #[test]
+        fn preserves_cid_reference() {
+            let html = r#"<img src="cid:abc123@example.com" alt="inline">"#;
+            let result = block_remote_content(html);
+            assert!(result.contains("cid:abc123@example.com"));
+        }
+
+        #[test]
+        fn preserves_anchor_href() {
+            let html = r#"<a href="https://example.com/page">Click</a>"#;
+            let result = block_remote_content(html);
+            assert!(result.contains(r#"href="https://example.com/page""#));
+        }
+
+        #[test]
+        fn strips_link_stylesheet_href() {
+            let html =
+                r#"<link rel="stylesheet" href="https://fonts.example.com/font.css">"#;
+            let result = block_remote_content(html);
+            assert!(!result.contains("https://fonts.example.com"));
+            assert!(result.contains("<link")); // tag preserved
+        }
+
+        #[test]
+        fn strips_script_src() {
+            let html = r#"<script src="https://evil.example.com/malware.js"></script>"#;
+            let result = block_remote_content(html);
+            assert!(!result.contains("https://evil.example.com"));
+        }
+
+        #[test]
+        fn strips_iframe_src() {
+            let html = r#"<iframe src="https://ads.example.com/banner"></iframe>"#;
+            let result = block_remote_content(html);
+            assert!(!result.contains("https://ads.example.com"));
+        }
+
+        #[test]
+        fn strips_css_url_in_style() {
+            let html = r#"<div style="background: url(https://tracker.example.com/bg.jpg)"></div>"#;
+            let result = block_remote_content(html);
+            assert!(!result.contains("https://tracker.example.com"));
+        }
+
+        #[test]
+        fn strips_css_url_protocol_relative() {
+            let html = r#"<div style="background: url(//tracker.example.com/bg.jpg)"></div>"#;
+            let result = block_remote_content(html);
+            assert!(!result.contains("//tracker.example.com"));
+        }
+
+        #[test]
+        fn strips_css_import() {
+            let html =
+                r#"<style>@import url("https://fonts.example.com/font.css");</style>"#;
+            let result = block_remote_content(html);
+            assert!(!result.contains("https://fonts.example.com"));
+        }
+
+        #[test]
+        fn strips_video_poster() {
+            let html = r#"<video poster="https://cdn.example.com/thumb.jpg"></video>"#;
+            let result = block_remote_content(html);
+            assert!(!result.contains("https://cdn.example.com"));
+        }
+
+        #[test]
+        fn strips_srcset() {
+            let html =
+                r#"<img srcset="https://cdn.example.com/img1.jpg 1x, https://cdn.example.com/img2.jpg 2x">"#;
+            let result = block_remote_content(html);
+            assert!(!result.contains("https://cdn.example.com"));
+        }
+
+        #[test]
+        fn strips_body_background() {
+            let html = r#"<body background="https://tracker.example.com/bg.jpg">"#;
+            let result = block_remote_content(html);
+            assert!(!result.contains("https://tracker.example.com"));
+            assert!(result.contains("<body"));
+        }
+
+        #[test]
+        fn handles_mixed_content() {
+            let html = r#"
+            <html>
+              <body>
+                <img src="https://spy.example.com/pixel.gif" width="1" height="1">
+                <img src="data:image/png;base64,OK123" alt="ok">
+                <a href="https://example.com/read-more">Read more</a>
+                <div style="background: url(https://tracker.example.com/bg.jpg) no-repeat"></div>
+              </body>
+            </html>"#;
+            let result = block_remote_content(html);
+            // Remote content gone
+            assert!(!result.contains("spy.example.com"));
+            assert!(!result.contains("tracker.example.com"));
+            // Safe content preserved
+            assert!(result.contains("data:image/png;base64,OK123"));
+            assert!(result.contains(r#"href="https://example.com/read-more""#));
+        }
+    }
 }
--- a/crates/server/Cargo.toml
+++ b/crates/server/Cargo.toml
@@ -3,6 +3,10 @@ name = "bichon-server"
 version.workspace = true
 edition.workspace = true

+[features]
+default = ["embed-web"]
+embed-web = ["dep:rust-embed"]
+

 [dependencies]
 bichon-core = { path = "../core", features = ["web-api"] }
@@ -17,7 +21,7 @@ poem-openapi = { version = "5.1.16", features = [
    "swagger-ui",
    "email",
 ] }
-rust-embed = "8.11.0"
+rust-embed = { version = "8.11.0", optional = true }
 email_address.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -29,7 +33,6 @@ tracing.workspace = true
 tokio.workspace = true
 http.workspace = true
 urlencoding.workspace = true
-mimalloc.workspace = true

 [dev-dependencies]
 poem = { version = "3.1.12", features = ["test"] }
--- a/crates/server/src/lib.rs
+++ b/crates/server/src/lib.rs
@@ -0,0 +1,135 @@
+//
+// Copyright (c) 2025-2026 rustmailer.com (https://rustmailer.com)
+//
+// This file is part of the Bichon Email Archiving Project
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+pub mod common;
+pub mod error;
+pub mod rest;
+
+use std::sync::LazyLock;
+
+use bichon_core::{
+    bichon_version,
+    cache::imap::task::SYNC_TASKS,
+    common::{rustls::BichonTls, signal::SignalManager},
+    context::{executors::BichonContext, Initialize},
+    database::manager::DB_MANAGER,
+    error::{code::ErrorCode, BichonResult},
+    logger,
+    migrate::check_data_status,
+    raise_error,
+    settings::{cli::SETTINGS, dir::DataDirManager},
+    store::{
+        blob::BLOB_MANAGER,
+        tantivy::{attachment::ATTACHMENT_MANAGER, envelope::ENVELOPE_MANAGER},
+    },
+    tasks::PeriodicTasks,
+    users::manager::UserManager,
+};
+use bichon_smtp::server::{start_smtp_server, SmtpServer};
+use tracing::{error, info};
+
+pub async fn run() -> BichonResult<()> {
+    logger::initialize_logging();
+    info!(
+        r#"
+     _      _        _
+    | |    (_)      | |
+    | |__   _   ___ | |__    ___   _ __
+    | '_ \ | | / __|| '_ \  / _ \ | '_ \
+    | |_) || || (__ | | | || (_) || | | |
+    |_.__/ |_| \___||_| |_| \___/ |_| |_|
+
+    "#
+    );
+    info!("Starting bichon-server");
+    info!("Version:  {}", bichon_version!());
+    info!("Git:      [{}]", env!("GIT_HASH"));
+    info!("GitHub:   https://github.com/rustmailer/bichon");
+
+    match check_data_status() {
+        Ok(false) => {
+            error!("Incompatible data format detected.");
+            error!("Your data was created by an older version of Bichon and must be migrated before use.");
+            error!("Please stop the Bichon v0.3.7 service before migration.");
+            error!("Please run: bichon-admin");
+            error!("Documentation: https://github.com/rustmailer/bichon/wiki/Bichon-Data-Migration:-v0.3.7-%E2%86%92-v1.0");
+            return Err(raise_error!(
+                "Legacy data layout detected".into(),
+                ErrorCode::InternalError
+            ));
+        }
+        Err(e) => {
+            error!("Failed to check data layout: {:#?}", e);
+            return Err(raise_error!(format!("{:#?}", e), ErrorCode::InternalError));
+        }
+        Ok(true) => {}
+    }
+
+    if let Err(error) = initialize().await {
+        eprintln!("{:?}", error);
+        return Err(error);
+    }
+
+    let periodic_tasks = PeriodicTasks::setup();
+    let mut smtp_service: Option<SmtpServer> = None;
+    if SETTINGS.bichon_enable_smtp {
+        info!("SMTP service is enabled, starting...");
+        match start_smtp_server().await {
+            Ok(server) => {
+                info!("SMTP server listening on: {}", server.smtp_addr);
+                smtp_service = Some(server);
+            }
+            Err(e) => {
+                error!("Failed to start SMTP server: {}", e);
+                return Err(raise_error!(format!("{:#?}", e), ErrorCode::InternalError));
+            }
+        }
+    } else {
+        info!("SMTP service is disabled by configuration.");
+    }
+
+    rest::start_http_server().await?;
+    periodic_tasks.shutdown().await;
+
+    if let Some(server) = smtp_service {
+        info!("Shutting down SMTP server...");
+        server.stop().await;
+        info!("SMTP server stopped.");
+    }
+
+    SYNC_TASKS.shutdown().await;
+    ENVELOPE_MANAGER.shutdown().await;
+    ATTACHMENT_MANAGER.shutdown().await;
+    BLOB_MANAGER.shutdown().await;
+    DB_MANAGER.flush();
+    info!("Bichon server stopped.");
+    Ok(())
+}
+
+async fn initialize() -> BichonResult<()> {
+    SignalManager::initialize().await?;
+    DataDirManager::initialize().await?;
+    UserManager::initialize().await?;
+    BichonTls::initialize().await?;
+    BichonContext::initialize().await?;
+    LazyLock::force(&BLOB_MANAGER);
+    LazyLock::force(&ENVELOPE_MANAGER);
+    LazyLock::force(&ATTACHMENT_MANAGER);
+    Ok(())
+}
--- a/crates/server/src/main.rs
+++ b/crates/server/src/main.rs
@@ -16,205 +16,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.

-use std::sync::LazyLock;
+use bichon_core::error::BichonResult;

-use bichon_core::{
-    bichon_version,
-    cache::imap::task::SYNC_TASKS,
-    common::rustls::BichonTls,
-    context::{executors::BichonContext, Initialize},
-    error::{code::ErrorCode, BichonResult},
-    logger,
-    migrate::check_data_status,
-    raise_error,
-    settings::cli::SETTINGS,
-    store::{
-        blob::BLOB_MANAGER,
-        tantivy::{attachment::ATTACHMENT_MANAGER, envelope::ENVELOPE_MANAGER},
-    },
-    tasks::PeriodicTasks,
-};
-use bichon_smtp::server::{start_smtp_server, SmtpServer};
-use mimalloc::MiMalloc;
-use tracing::{error, info};
-
-use bichon_core::{
-    common::signal::SignalManager, settings::dir::DataDirManager, users::manager::UserManager,
-};
-
-use crate::rest::start_http_server;
-
-pub mod common;
-pub mod error;
-pub mod rest;
-
-#[global_allocator]
-static GLOBAL: MiMalloc = MiMalloc;
-
-static LOGO: &str = r#"
- _      _        _                   
-| |    (_)      | |                  
-| |__   _   ___ | |__    ___   _ __  
-| '_ \ | | / __|| '_ \  / _ \ | '_ \ 
-| |_) || || (__ | | | || (_) || | | |
-|_.__/ |_| \___||_| |_| \___/ |_| |_|
-                                     
-"#;
 #[tokio::main]
 async fn main() -> BichonResult<()> {
-    logger::initialize_logging();
-    info!("{}", LOGO);
-    info!("Starting bichon-server");
-    info!("Version:  {}", bichon_version!());
-    info!("Git:      [{}]", env!("GIT_HASH"));
-    info!("GitHub:   https://github.com/rustmailer/bichon");
-
-    match check_data_status() {
-        Ok(false) => {
-            error!("Incompatible data format detected.");
-            error!("Your data was created by an older version of Bichon and must be migrated before use.");
-            error!("Please stop the Bichon v0.3.7 service before migration.");
-            error!("Please run: bichon-admin");
-            error!("Documentation: https://github.com/rustmailer/bichon/wiki/Bichon-Data-Migration:-v0.3.7-%E2%86%92-v1.0");
-            return Err(raise_error!(
-                "Legacy data layout detected".into(),
-                ErrorCode::InternalError
-            ));
-        }
-        Err(e) => {
-            error!("Failed to check data layout: {:#?}", e);
-            return Err(raise_error!(format!("{:#?}", e), ErrorCode::InternalError));
-        }
-        Ok(true) => {}
-    }
-
-    if let Err(error) = initialize().await {
-        eprintln!("{:?}", error);
-        return Err(error);
-    }
-
-    let periodic_tasks = PeriodicTasks::setup();
-    let mut smtp_service: Option<SmtpServer> = None;
-    if SETTINGS.bichon_enable_smtp {
-        info!("SMTP service is enabled, starting...");
-        match start_smtp_server().await {
-            Ok(server) => {
-                info!("SMTP server listening on: {}", server.smtp_addr);
-                smtp_service = Some(server);
-            }
-            Err(e) => {
-                error!("Failed to start SMTP server: {}", e);
-                return Err(raise_error!(format!("{:#?}", e), ErrorCode::InternalError));
-            }
-        }
-    } else {
-        info!("SMTP service is disabled by configuration.");
-    }
-
-    start_http_server().await?;
-    periodic_tasks.shutdown().await;
-
-    if let Some(server) = smtp_service {
-        info!("Shutting down SMTP server...");
-        server.stop().await;
-        info!("SMTP server stopped.");
-    }
-
-    SYNC_TASKS.shutdown().await;
-    ENVELOPE_MANAGER.shutdown().await;
-    ATTACHMENT_MANAGER.shutdown().await;
-    BLOB_MANAGER.shutdown().await;
-    info!("Bichon server stopped.");
-    Ok(())
-}
-
-/// Initialize the system by validating settings and starting necessary tasks.
-async fn initialize() -> BichonResult<()> {
-    SignalManager::initialize().await?;
-    DataDirManager::initialize().await?;
-    UserManager::initialize().await?;
-    BichonTls::initialize().await?;
-    BichonContext::initialize().await?;
-    LazyLock::force(&BLOB_MANAGER);
-    LazyLock::force(&ENVELOPE_MANAGER);
-    LazyLock::force(&ATTACHMENT_MANAGER);
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests;
-
-#[cfg(test)]
-mod api_tests {
-    use super::rest::api::create_openapi_service;
-    use poem::test::TestClient;
-
-    #[tokio::test]
-    async fn openapi_spec_json_is_served() {
-        let api_service = create_openapi_service();
-        let spec_endpoint = api_service.spec_endpoint();
-        let cli = TestClient::new(spec_endpoint);
-
-        let resp = cli.get("/").send().await;
-        resp.assert_status_is_ok();
-
-        let body = resp.json().await;
-        let obj = body.value().object();
-        assert!(obj.get_opt("openapi").is_some(), "missing openapi version");
-        assert!(obj.get_opt("info").is_some(), "missing info section");
-        assert!(obj.get_opt("paths").is_some(), "missing paths section");
-    }
-
-    #[tokio::test]
-    async fn openapi_spec_yaml_is_served() {
-        let api_service = create_openapi_service();
-        let spec_endpoint = api_service.spec_endpoint_yaml();
-        let cli = TestClient::new(spec_endpoint);
-
-        let resp = cli.get("/").send().await;
-        resp.assert_status_is_ok();
-    }
-
-    #[tokio::test]
-    async fn swagger_ui_is_served() {
-        let api_service = create_openapi_service();
-        let swagger = api_service.swagger_ui();
-        let cli = TestClient::new(swagger);
-
-        let resp = cli.get("/").send().await;
-        resp.assert_status_is_ok();
-    }
-
-    #[tokio::test]
-    async fn openapi_spec_lists_all_tag_groups() {
-        let api_service = create_openapi_service();
-        let spec_endpoint = api_service.spec_endpoint();
-        let cli = TestClient::new(spec_endpoint);
-
-        let resp = cli.get("/").send().await;
-        let body = resp.json().await;
-        let value = body.value();
-
-        let tag_names: Vec<&str> = value
-            .object()
-            .get("tags")
-            .array()
-            .iter()
-            .map(|v| v.object().get("name").string())
-            .collect();
-
-        assert!(
-            tag_names.contains(&"AccessToken"),
-            "missing AccessToken tag"
-        );
-        assert!(tag_names.contains(&"Attachment"), "missing Attachment tag");
-        assert!(tag_names.contains(&"AutoConfig"), "missing AutoConfig tag");
-        assert!(tag_names.contains(&"Account"), "missing Account tag");
-        assert!(tag_names.contains(&"System"), "missing System tag");
-        assert!(tag_names.contains(&"Mailbox"), "missing Mailbox tag");
-        assert!(tag_names.contains(&"OAuth2"), "missing OAuth2 tag");
-        assert!(tag_names.contains(&"Message"), "missing Message tag");
-        assert!(tag_names.contains(&"Import"), "missing Import tag");
-        assert!(tag_names.contains(&"Users"), "missing Users tag");
-    }
+    bichon_server::run().await
 }
--- a/crates/server/src/rest/api/message.rs
+++ b/crates/server/src/rest/api/message.rs
@@ -121,6 +121,8 @@ impl MessageApi {
    }

    /// Fetches the content of a specific email.
+    /// Set `block_remote_content=true` to strip external images, scripts,
+    /// and other content loaded from http/https URLs.
    #[oai(
        path = "/message-content/:account_id/:envelope_id",
        method = "get",
@@ -132,11 +134,18 @@ impl MessageApi {
        account_id: Path<u64>,
        /// The ID of the message to fetch.
        envelope_id: Path<String>,
+        /// Block remote content (http/https URLs) from email body.
+        block_remote_content: Query<Option<bool>>,
        context: WrappedContext,
    ) -> ApiResult<Json<FullMessageContent>> {
        let account_id = account_id.0;
+        let block_remote = block_remote_content.0.unwrap_or(false);
        context.require_permission(Some(account_id), Permission::DATA_READ)?;
-        Ok(Json(retrieve_email_content(account_id, envelope_id.0)?))
+        Ok(Json(retrieve_email_content(
+            account_id,
+            envelope_id.0,
+            block_remote,
+        )?))
    }

    /// Retrieves the content of an email embedded as an attachment.
@@ -152,15 +161,18 @@ impl MessageApi {
        /// The ID of the message to fetch.
        envelope_id: Path<String>,
        content_hash: Query<String>,
+        block_remote_content: Query<Option<bool>>,
        context: WrappedContext,
    ) -> ApiResult<Json<FullNestedMessageContent>> {
        let account_id = account_id.0;
+        let block_remote = block_remote_content.0.unwrap_or(false);
        context.require_permission(Some(account_id), Permission::DATA_READ)?;
        let content_hash = content_hash.0.trim();
        Ok(Json(retrieve_nested_eml_content(
            account_id,
            envelope_id.0,
            content_hash,
+            block_remote,
        )?))
    }

@@ -213,7 +225,7 @@ impl MessageApi {
        AccountModel::check_account_exists(account_id)?;
        context.require_permission(Some(account_id), Permission::DATA_RAW_DOWNLOAD)?;
        let envelope_id = envelope_id.0;
-        let reader = get_reader(account_id, envelope_id.clone())?;
+        let reader = get_reader(account_id, envelope_id.clone()).await?;
        let body = Body::from_async_read(reader);
        let attachment = Attachment::new(body)
            .attachment_type(AttachmentType::Attachment)
--- a/crates/server/src/rest/assets.rs
+++ b/crates/server/src/rest/assets.rs
@@ -1,24 +1,11 @@
-//
-// Copyright (c) 2025-2026 rustmailer.com (https://rustmailer.com)
-//
-// This file is part of the Bichon Email Archiving Project
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#[cfg(feature = "embed-web")]
+mod inner {
+    use rust_embed::RustEmbed;

+    #[derive(RustEmbed)]
+    #[folder = "../../web/dist/"]
+    pub struct FrontEndAssets;
+}

-use rust_embed::RustEmbed;
-
-#[derive(RustEmbed)]
-#[folder = "../../web/dist/"]
-pub struct FrontEndAssets;
+#[cfg(feature = "embed-web")]
+pub use inner::FrontEndAssets;
--- a/crates/server/src/rest/mod.rs
+++ b/crates/server/src/rest/mod.rs
@@ -16,51 +16,49 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.

+use crate::common::auth::ApiGuard;
 use crate::common::error::ErrorCapture;
 use crate::common::log::Tracing;
 use crate::common::tls::rustls_config;
+use crate::common::timeout::{Timeout, TIMEOUT_HEADER};
 use crate::error::handler::error_handler;
+use crate::rest::public::features::get_features;
 use crate::rest::public::login::login;
 use crate::rest::public::status::get_status;
 use bichon_core::common::signal::SIGNAL_MANAGER;
 use bichon_core::error::code::ErrorCode;
 use bichon_core::error::BichonResult;
+use bichon_core::raise_error;
 use bichon_core::settings::cli::SETTINGS;

-use super::error::ApiErrorResponse;
-use crate::common::auth::ApiGuard;
-use crate::common::timeout::{Timeout, TIMEOUT_HEADER};
 use api::create_openapi_service;
-use assets::FrontEndAssets;
-use bichon_core::raise_error;
-use http::{HeaderValue, Method};
-use poem::endpoint::EmbeddedFilesEndpoint;
+use http::Method;
 use poem::listener::{Listener, TcpListener};
-use poem::middleware::{CatchPanic, Compression, SetHeader};
-use poem::{get, handler, post, IntoResponse};
-use poem::{middleware::Cors, EndpointExt, Route, Server};
+use poem::middleware::{CatchPanic, Compression, Cors};
+use poem::{get, post, Endpoint, EndpointExt, Route, Server};
 use public::oauth2::oauth2_callback;
 use std::collections::HashSet;
 use std::time::Duration;

+#[cfg(feature = "embed-web")]
+use {
+    assets::FrontEndAssets,
+    http::HeaderValue,
+    poem::{handler, endpoint::EmbeddedFilesEndpoint, IntoResponse},
+    poem::middleware::SetHeader,
+};
+
 pub mod api;
 pub mod assets;
 pub mod public;

 pub type ApiResult<T, E = ApiErrorResponse> = std::result::Result<T, E>;

-pub async fn start_http_server() -> BichonResult<()> {
-    let listener = TcpListener::bind((
-        SETTINGS.bichon_bind_ip.clone().unwrap_or("0.0.0.0".into()),
-        SETTINGS.bichon_http_port as u16,
-    ));
-
-    let listener = if SETTINGS.bichon_enable_rest_https {
-        listener.rustls(rustls_config()?).boxed()
-    } else {
-        listener.boxed()
-    };
+use super::error::ApiErrorResponse;

+/// Build the community route tree. Pro/Enterprise servers can call this
+/// and then add their own routes before passing the tree to the server.
+pub fn build_routes() -> impl Endpoint {
    let api_service = create_openapi_service()
        .summary("A lightweight, high-performance Rust email archiver with WebUI");

@@ -79,7 +77,6 @@ pub async fn start_http_server() -> BichonResult<()> {
        .with(Tracing);

    let cors_origins: Option<HashSet<String>> = SETTINGS.bichon_cors_origins.clone();
-
    let cors_origins: Vec<String> = cors_origins.unwrap_or_default().into_iter().collect();

    let cors = Cors::new()
@@ -92,7 +89,6 @@ pub async fn start_http_server() -> BichonResult<()> {
            }
            cors_origins.iter().any(|o| o == origin)
        })
-        //.allow_origins(cors_origins)
        .allow_credentials(true)
        .allow_methods(&[
            Method::GET,
@@ -107,13 +103,6 @@ pub async fn start_http_server() -> BichonResult<()> {
        .expose_headers(vec!["Accept"])
        .max_age(SETTINGS.bichon_cors_max_age);

-    let cache_static = || {
-        SetHeader::new().overriding(
-            http::header::CACHE_CONTROL,
-            HeaderValue::from_static("max-age=86400"),
-        )
-    };
-
    let app_logic = Route::new()
        .nest("/api-docs/swagger", swagger)
        .nest("/api-docs/redoc", redoc)
@@ -122,42 +111,43 @@ pub async fn start_http_server() -> BichonResult<()> {
        .nest("/api-docs/spec.json", spec_json)
        .nest("/api-docs/spec.yaml", spec_yaml)
        .nest("/oauth2/callback", get(oauth2_callback))
+        .nest("/api/v1/features", get(get_features))
        .nest("/api/status", get(get_status))
        .nest("/api/login", post(login))
-        .nest_no_strip("/api/v1", open_api_route)
+        .nest_no_strip("/api/v1", open_api_route);
+
+    let app_logic = add_web_assets(app_logic);
+
+    Route::new()
+        .nest(&SETTINGS.bichon_base_url, app_logic)
+        .with(cors)
+        .with_if(SETTINGS.bichon_http_compression_enabled, Compression::new())
+        .with(CatchPanic::new())
+}
+
+#[cfg(feature = "embed-web")]
+fn add_web_assets(route: Route) -> impl Endpoint {
+    let cache_static = || {
+        SetHeader::new().overriding(
+            http::header::CACHE_CONTROL,
+            HeaderValue::from_static("max-age=86400"),
+        )
+    };
+
+    route
        .nest_no_strip(
            "/assets",
            EmbeddedFilesEndpoint::<FrontEndAssets>::new().with(cache_static()),
        )
-        .at("/*", serve_index_with_base);
-
-    let route = Route::new()
-        .nest(&SETTINGS.bichon_base_url, app_logic)
-        .with(cors)
-        .with_if(SETTINGS.bichon_http_compression_enabled, Compression::new())
-        .with(CatchPanic::new());
-
-    let mut rx = SIGNAL_MANAGER.subscribe();
-    let shutdown_fut = async move {
-        let _ = rx.recv().await;
-    };
-    let server = Server::new(listener)
-        .name("Bichon Service")
-        .idle_timeout(Duration::from_secs(60))
-        .run_with_graceful_shutdown(
-            route.catch_all_error(error_handler),
-            shutdown_fut,
-            Some(Duration::from_secs(5)),
-        );
-    println!(
-        "Bichon Service is now running on port {}.",
-        SETTINGS.bichon_http_port
-    );
-    server
-        .await
-        .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))
+        .at("/*", serve_index_with_base)
 }

+#[cfg(not(feature = "embed-web"))]
+fn add_web_assets(route: Route) -> Route {
+    route
+}
+
+#[cfg(feature = "embed-web")]
 #[handler]
 async fn serve_index_with_base() -> impl IntoResponse {
    let mut html =
@@ -180,3 +170,38 @@ async fn serve_index_with_base() -> impl IntoResponse {
        .content_type("text/html; charset=utf-8")
        .body(html)
 }
+
+pub async fn start_http_server() -> BichonResult<()> {
+    let listener = TcpListener::bind((
+        SETTINGS.bichon_bind_ip.clone().unwrap_or("0.0.0.0".into()),
+        SETTINGS.bichon_http_port as u16,
+    ));
+
+    let listener = if SETTINGS.bichon_enable_rest_https {
+        listener.rustls(rustls_config()?).boxed()
+    } else {
+        listener.boxed()
+    };
+
+    let route = build_routes();
+
+    let mut rx = SIGNAL_MANAGER.subscribe();
+    let shutdown_fut = async move {
+        let _ = rx.recv().await;
+    };
+    let server = Server::new(listener)
+        .name("Bichon Service")
+        .idle_timeout(Duration::from_secs(60))
+        .run_with_graceful_shutdown(
+            route.catch_all_error(error_handler),
+            shutdown_fut,
+            Some(Duration::from_secs(5)),
+        );
+    println!(
+        "Bichon Service is now running on port {}.",
+        SETTINGS.bichon_http_port
+    );
+    server
+        .await
+        .map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))
+}
--- a/crates/server/src/rest/public/features.rs
+++ b/crates/server/src/rest/public/features.rs
@@ -0,0 +1,36 @@
+//
+// Copyright (c) 2025-2026 rustmailer.com (https://rustmailer.com)
+//
+// This file is part of the Bichon Email Archiving Project
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use poem::{handler, web::Json, IntoResponse};
+use serde::Serialize;
+
+#[derive(Serialize)]
+struct FeaturesResponse {
+    features: Vec<String>,
+    edition: &'static str,
+    version: String,
+}
+
+#[handler]
+pub async fn get_features() -> impl IntoResponse {
+    Json(FeaturesResponse {
+        features: vec![],
+        edition: "community",
+        version: env!("CARGO_PKG_VERSION").to_string(),
+    })
+}
--- a/crates/server/src/rest/public/mod.rs
+++ b/crates/server/src/rest/public/mod.rs
@@ -17,6 +17,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.


+pub mod features;
 pub mod login;
 pub mod oauth2;
 pub mod status;
--- a/crates/smtp/src/server.rs
+++ b/crates/smtp/src/server.rs
@@ -628,6 +628,7 @@ async fn parse_email(data: &[u8], session: &Session) -> BichonResult<()> {
        unseen: None,
        uid_next: None,
        uid_validity: None,
+        highest_uid: None,
    };
    let mailbox_id = mailbox.id;

--- a/web/src/api/account/api.ts
+++ b/web/src/api/account/api.ts
@@ -128,7 +128,6 @@ export interface AccountModel {
    capabilities?: string[];
    date_since?: DateSelection;
    date_before?: RelativeDate;
-    folder_limit?: number,
    download_folders: string[];
    download_interval_min?: number;
    download_batch_size?: number;
@@ -143,6 +142,7 @@ export interface AccountModel {
    imap_quota_window?: QuotaWindow;
    imap_quota_bytes?: number;
    auto_download_new_mailboxes?: boolean;
+    download_schedule?: string;
 }

 export const download_state = async (account_id: number) => {
--- a/web/src/api/mailbox/envelope/api.ts
+++ b/web/src/api/mailbox/envelope/api.ts
@@ -64,7 +64,8 @@ export interface AttachmentInfo {
 export interface MessageContentResponse {
    text?: string;
    html?: string;
-    attachments?: AttachmentInfo[]
+    attachments?: AttachmentInfo[];
+    has_remote_content?: boolean;
 }

 export interface NestedMessageContentResponse {
@@ -72,6 +73,7 @@ export interface NestedMessageContentResponse {
    html?: string;
    attachments?: AttachmentInfo[];
    envelope: EmailEnvelope;
+    has_remote_content?: boolean;
 }

 export const getContent = (messageContent: MessageContentResponse): string | null => {
@@ -83,13 +85,25 @@ export const getContent = (messageContent: MessageContentResponse): string | nul
    return null;
 };

-export const load_message = async (accountId: number, id: string) => {
-    const response = await axiosInstance.get<MessageContentResponse>(`api/v1/message-content/${accountId}/${id}`);
+export const load_message = async (accountId: number, id: string, blockRemoteContent = false) => {
+    const params = new URLSearchParams();
+    if (blockRemoteContent) {
+        params.set('block_remote_content', 'true');
+    }
+    const qs = params.toString();
+    const url = `api/v1/message-content/${accountId}/${id}${qs ? '?' + qs : ''}`;
+    const response = await axiosInstance.get<MessageContentResponse>(url);
    return response.data;
 };

-export const load_nested_message = async (accountId: number, id: string, content_hash: string) => {
-    const response = await axiosInstance.get<NestedMessageContentResponse>(`api/v1/nested-message-content/${accountId}/${id}?content_hash=${content_hash}`);
+export const load_nested_message = async (accountId: number, id: string, content_hash: string, blockRemoteContent = false) => {
+    const params = new URLSearchParams({ content_hash });
+    if (blockRemoteContent) {
+        params.set('block_remote_content', 'true');
+    }
+    const response = await axiosInstance.get<NestedMessageContentResponse>(
+        `api/v1/nested-message-content/${accountId}/${id}?${params.toString()}`
+    );
    return response.data;
 };

--- a/web/src/components/mail-iframe.tsx
+++ b/web/src/components/mail-iframe.tsx
@@ -31,7 +31,7 @@ const EmailIframe: React.FC<EmailIframeProps> = ({ emailHtml, height }) => {
  return (
    <iframe
      src={iframeSrc}
-      sandbox="allow-scripts"
+      sandbox=""
      className="w-full border-none"
      title="Email Content"
      style={{ height: height ?? '4000px' }}
--- a/web/src/features/accounts/components/tests/schema.test.ts
+++ b/web/src/features/accounts/components/tests/schema.test.ts
@@ -213,37 +213,6 @@ describe('Account Form Schema', () => {
    })
  })

-  describe('folder_limit field', () => {
-    it('accepts undefined folder_limit', () => {
-      const result = getAccountSchema(false, t).safeParse(validAccountData)
-      expect(result.success).toBe(true)
-    })
-
-    it('accepts null folder_limit', () => {
-      const result = getAccountSchema(false, t).safeParse({
-        ...validAccountData,
-        folder_limit: null,
-      })
-      expect(result.success).toBe(true)
-    })
-
-    it('rejects folder_limit less than 100', () => {
-      const result = getAccountSchema(false, t).safeParse({
-        ...validAccountData,
-        folder_limit: 50,
-      })
-      expect(result.success).toBe(false)
-    })
-
-    it('accepts folder_limit of exactly 100', () => {
-      const result = getAccountSchema(false, t).safeParse({
-        ...validAccountData,
-        folder_limit: 100,
-      })
-      expect(result.success).toBe(true)
-    })
-  })
-
  describe('account_name and login_name fields', () => {
    it('accepts undefined account_name and login_name', () => {
      const result = getAccountSchema(false, t).safeParse(validAccountData)
@@ -266,6 +235,45 @@ describe('Account Form Schema', () => {
      expect(result.success).toBe(true)
    })
  })
+
+  describe('download_schedule field', () => {
+    it('accepts undefined download_schedule', () => {
+      const result = getAccountSchema(false, t).safeParse(validAccountData)
+      expect(result.success).toBe(true)
+    })
+
+    it('accepts valid 6-field cron expression', () => {
+      const result = getAccountSchema(false, t).safeParse({
+        ...validAccountData,
+        download_schedule: '0 0 0 * * *',
+      })
+      expect(result.success).toBe(true)
+    })
+
+    it('accepts cron with */step syntax', () => {
+      const result = getAccountSchema(false, t).safeParse({
+        ...validAccountData,
+        download_schedule: '0 */30 8-17 * * 1-5',
+      })
+      expect(result.success).toBe(true)
+    })
+
+    it('rejects cron with too few fields', () => {
+      const result = getAccountSchema(false, t).safeParse({
+        ...validAccountData,
+        download_schedule: '0 0 *',
+      })
+      expect(result.success).toBe(false)
+    })
+
+    it('accepts empty string cron (treated as not set)', () => {
+      const result = getAccountSchema(false, t).safeParse({
+        ...validAccountData,
+        download_schedule: '',
+      })
+      expect(result.success).toBe(true)
+    })
+  })
 })

 describe('Auth Config Schema (password validation)', () => {
--- a/web/src/features/accounts/components/account-detail.tsx
+++ b/web/src/features/accounts/components/account-detail.tsx
@@ -133,8 +133,8 @@ export function AccountDetailDrawer({ open, onOpenChange, currentRow }: Props) {
                        )}
                      </div>
                      <div className="flex flex-wrap items-center gap-2">
-                        <span className="text-muted-foreground">{t('accounts.folderLimit')}:</span>
-                        <span>{currentRow.folder_limit ? currentRow.folder_limit : t('accounts.notAvailable')}</span>
+                        <span className="text-muted-foreground">{t('accounts.downloadSchedule')}:</span>
+                        <span>{currentRow.download_schedule || t('accounts.notAvailable')}</span>
                      </div>
                    </div>
                  </CardContent>
--- a/web/src/features/accounts/components/action-dialog.tsx
+++ b/web/src/features/accounts/components/action-dialog.tsx
@@ -49,7 +49,7 @@ export type Steps = [...Step[]];
 const getSteps = (t: (key: string) => string): Steps => [
  { id: "step-1", name: t('accounts.steps.emailAddress'), fields: ["email", "account_name"] },
  { id: "step-2", name: t('accounts.steps.imap'), fields: ["imap", "use_dangerous", "login_name"] },
-  { id: "step-3", name: t('accounts.steps.syncPreferences'), fields: ["enabled", "date_since", "date_before", "folder_limit", "download_interval_min", "download_batch_size", "auto_download_new_mailboxes"] },
+  { id: "step-3", name: t('accounts.steps.syncPreferences'), fields: ["enabled", "date_since", "date_before", "download_interval_min", "download_batch_size", "auto_download_new_mailboxes", "download_schedule"] },
  { id: "step-4", name: t('accounts.steps.summary'), fields: [] },
 ];

@@ -79,10 +79,10 @@ const defaultValues: Account = {
  use_dangerous: false,
  date_since: undefined,
  date_before: undefined,
-  folder_limit: undefined,
  download_interval_min: 60,
  download_batch_size: 30,
  auto_download_new_mailboxes: true,
+  download_schedule: undefined,
 };

 const emptyImap: ImapConfig = {
@@ -109,10 +109,10 @@ const mapCurrentRowToFormValues = (currentRow: AccountModel): Account => {
    use_dangerous: currentRow.use_dangerous,
    date_since: currentRow.date_since ?? undefined,
    date_before: currentRow.date_before ?? undefined,
-    folder_limit: currentRow.folder_limit ?? undefined,
    download_interval_min: currentRow.download_interval_min ?? 60,
    download_batch_size: currentRow.download_batch_size ?? 30,
    auto_download_new_mailboxes: currentRow.auto_download_new_mailboxes ?? true,
+    download_schedule: currentRow.download_schedule ?? undefined,
  };
 };

@@ -191,18 +191,18 @@ export function AccountActionDialog({ currentRow, open, onOpenChange }: Props) {
        use_dangerous: data.use_dangerous,
        date_since: data.date_since,
        date_before: data.date_before,
-        folder_limit: data.folder_limit,
        download_interval_min: data.download_interval_min,
        download_batch_size: data.download_batch_size,
        auto_download_new_mailboxes: data.auto_download_new_mailboxes,
+        download_schedule: data.download_schedule || null,
      };
      if (isEdit) {
        const isAllMode = !data.date_since && !data.date_before;
-        const clear_folder_limit = !data.folder_limit;
+        const clear_download_schedule = !data.download_schedule && currentRow?.download_schedule;
        updateMutation.mutate({
          ...commonData,
          ...(isAllMode ? { clear_date_range: true } : {}),
-          ...(clear_folder_limit ? { clear_folder_limit: true } : {})
+          ...(clear_download_schedule ? { clear_download_schedule: true } : {})
        });
      } else {
        createMutation.mutate({ ...commonData, account_type: "IMAP" });
--- a/web/src/features/accounts/components/columns.tsx
+++ b/web/src/features/accounts/components/columns.tsx
@@ -106,9 +106,12 @@ export function useColumns(): ColumnDef<AccountModel>[] {
        if (account_type === "NoSync") {
          return <LongText className="text-center">n/a</LongText>
        }
+        if (row.original.download_schedule) {
+          return <LongText className="text-center">{row.original.download_schedule}</LongText>
+        }
        return <LongText className="text-center">{row.original.download_interval_min} min</LongText>
      },
-      meta: { className: 'text-center max-w-[120px]' },
+      meta: { className: 'text-center max-w-[160px]' },
      enableHiding: false,
    },
    {
--- a/web/src/features/accounts/components/data-table-row-actions.tsx
+++ b/web/src/features/accounts/components/data-table-row-actions.tsx
@@ -98,26 +98,6 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
          </Button>
        </DropdownMenuTrigger>
        <DropdownMenuContent align='end' className='w-[220px]'>
-
-          {showDownload && (
-            <DropdownMenuItem onClick={handleStartDownload}>
-              {t('accounts.startDownload')}
-              <DropdownMenuShortcut>
-                <IconPlayerPlay size={16} />
-              </DropdownMenuShortcut>
-            </DropdownMenuItem>
-          )}
-
-
-          {showDownload && (
-            <DropdownMenuItem onClick={handleCancelDownload}>
-              {t('accounts.cancelDownload')}
-              <DropdownMenuShortcut>
-                <IconPlayerStop size={16} />
-              </DropdownMenuShortcut>
-            </DropdownMenuItem>
-          )}
-          {showDownload && <DropdownMenuSeparator />}
          {hasPermission && <DropdownMenuItem
            onClick={() => {
              setCurrentRow(row.original)
@@ -169,6 +149,27 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
            </DropdownMenuShortcut>
          </DropdownMenuItem>}
          {hasPermission && <DropdownMenuSeparator />}
+
+          {showDownload && (
+            <DropdownMenuItem onClick={handleStartDownload}>
+              {t('accounts.startDownload')}
+              <DropdownMenuShortcut>
+                <IconPlayerPlay size={16} />
+              </DropdownMenuShortcut>
+            </DropdownMenuItem>
+          )}
+
+
+          {showDownload && (
+            <DropdownMenuItem onClick={handleCancelDownload}>
+              {t('accounts.cancelDownload')}
+              <DropdownMenuShortcut>
+                <IconPlayerStop size={16} />
+              </DropdownMenuShortcut>
+            </DropdownMenuItem>
+          )}
+          {showDownload && <DropdownMenuSeparator />}
+
          {hasPermission && <DropdownMenuItem
            onClick={() => {
              setCurrentRow(row.original)
--- a/web/src/features/accounts/components/schema.ts
+++ b/web/src/features/accounts/components/schema.ts
@@ -79,12 +79,6 @@ export const getAccountSchema = (isEdit: boolean, t: (key: string) => string) =>
    use_dangerous: z.boolean(),
    date_since: dateSelectionSchema(t).optional(),
    date_before: relativeDateSchema(t).optional(),
-    folder_limit: z
-      .number({ invalid_type_error: t('validation.folderLimitMustBeNumber') })
-      .int()
-      .min(100, { message: t('validation.folderLimitMustBeAtLeast100') })
-      .nullable()
-      .optional(),
    download_interval_min: z
      .number({
        invalid_type_error: t('validation.incrementalSyncMustBeNumber'),
@@ -107,6 +101,18 @@ export const getAccountSchema = (isEdit: boolean, t: (key: string) => string) =>
        message: t('validation.singleRequestBatchSizeTooLarge'),
      }),
    auto_download_new_mailboxes: z.boolean(),
+    download_schedule: z
+      .string()
+      .optional()
+      .refine(
+        (val) => {
+          if (!val || val.trim() === '') return true;
+          const fields = val.trim().split(/\s+/);
+          if (fields.length < 6) return false;
+          return true;
+        },
+        { message: t('validation.invalidCronExpression') }
+      ),
  })

 export type AccountFormValues = z.infer<
--- a/web/src/features/accounts/components/step3.tsx
+++ b/web/src/features/accounts/components/step3.tsx
@@ -48,6 +48,72 @@ import i18n from "@/i18n";


 type SyncMode = 'all' | 'since_fixed' | 'since_relative' | 'before_relative';
+type ScheduleMode = 'interval' | 'cron';
+type CronMode = 'simple' | 'advanced';
+type CronFrequency = 'daily' | 'weekly' | 'monthly';
+
+interface CronSimpleState {
+    frequency: CronFrequency;
+    hour: number;
+    minute: number;
+    dayOfWeek: number;
+    dayOfMonth: number;
+}
+
+const DEFAULT_CRON_SIMPLE: CronSimpleState = {
+    frequency: 'daily',
+    hour: 0,
+    minute: 0,
+    dayOfWeek: 1,
+    dayOfMonth: 1,
+};
+
+function buildCronFromSimple(s: CronSimpleState): string {
+    switch (s.frequency) {
+        case 'daily':
+            return `0 ${s.minute} ${s.hour} * * *`;
+        case 'weekly':
+            return `0 ${s.minute} ${s.hour} * * ${s.dayOfWeek}`;
+        case 'monthly':
+            return `0 ${s.minute} ${s.hour} ${s.dayOfMonth} * *`;
+    }
+}
+
+function tryParseCronToSimple(cron: string): CronSimpleState | null {
+    const fields = cron.trim().split(/\s+/);
+    if (fields.length < 6) return null;
+
+    const sec = fields[0];
+    const min = fields[1];
+    const hour = fields[2];
+    const dom = fields[3];
+    const month = fields[4];
+    const dow = fields[5];
+
+    if (sec !== '0') return null;
+    if (month !== '*') return null;
+
+    const minuteVal = parseInt(min, 10);
+    const hourVal = parseInt(hour, 10);
+    if (isNaN(minuteVal) || isNaN(hourVal)) return null;
+
+    if (dom === '*' && dow === '*') {
+        return { frequency: 'daily', hour: hourVal, minute: minuteVal, dayOfWeek: 1, dayOfMonth: 1 };
+    }
+    if (dom === '*') {
+        const dowVal = parseInt(dow, 10);
+        if (!isNaN(dowVal)) {
+            return { frequency: 'weekly', hour: hourVal, minute: minuteVal, dayOfWeek: dowVal, dayOfMonth: 1 };
+        }
+    }
+    if (dow === '*') {
+        const domVal = parseInt(dom, 10);
+        if (!isNaN(domVal)) {
+            return { frequency: 'monthly', hour: hourVal, minute: minuteVal, dayOfWeek: 1, dayOfMonth: domVal };
+        }
+    }
+    return null;
+}

 export default function Step3() {
    const { t } = useTranslation();
@@ -61,6 +127,31 @@ export default function Step3() {
        return 'all';
    });

+    const [scheduleMode, setScheduleMode] = useState<ScheduleMode>(() => {
+        if (current.download_schedule) return 'cron';
+        return 'interval';
+    });
+
+    const [cronMode, setCronMode] = useState<CronMode>(() => {
+        if (current.download_schedule && tryParseCronToSimple(current.download_schedule)) {
+            return 'simple';
+        }
+        if (current.download_schedule) return 'advanced';
+        return 'simple';
+    });
+
+    const [cronSimple, setCronSimple] = useState<CronSimpleState>(() => {
+        if (current.download_schedule) {
+            return tryParseCronToSimple(current.download_schedule) ?? DEFAULT_CRON_SIMPLE;
+        }
+        return DEFAULT_CRON_SIMPLE;
+    });
+
+    const updateCronFromSimple = (partial: Partial<CronSimpleState>) => {
+        const next = { ...cronSimple, ...partial };
+        setCronSimple(next);
+        setValue('download_schedule', buildCronFromSimple(next));
+    };

    const handleModeChange = (mode: SyncMode) => {
        setSyncMode(mode);
@@ -77,41 +168,231 @@ export default function Step3() {
        }
    };

+    const handleScheduleModeChange = (mode: ScheduleMode) => {
+        setScheduleMode(mode);
+        if (mode === 'interval') {
+            setValue("download_schedule", undefined);
+        } else {
+            setValue("download_interval_min", 60);
+            if (cronMode === 'simple') {
+                updateCronFromSimple(cronSimple);
+            }
+        }
+    };
+
    return (
        <div className="space-y-8">
-            <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-                <FormField
-                    control={control}
-                    name="download_interval_min"
-                    render={({ field }) => (
-                        <FormItem>
-                            <FormLabel>{t('accounts.downloadInterval')}</FormLabel>
-                            <FormControl>
-                                <Input type="number" {...field} onChange={(e) => field.onChange(parseInt(e.target.value, 10))} />
-                            </FormControl>
-                            <FormMessage />
-                            <FormDescription>
-                                {t('accounts.downloadIntervalPlaceholder')}
-                            </FormDescription>
-                        </FormItem>
+            <div className="space-y-4">
+                <FormItem>
+                    <FormLabel className="text-base font-semibold">{t('accounts.scheduleMode')}</FormLabel>
+                    <FormDescription>
+                        {t('accounts.scheduleModeDescription')}
+                    </FormDescription>
+                    <Select value={scheduleMode} onValueChange={(v) => handleScheduleModeChange(v as ScheduleMode)}>
+                        <SelectTrigger className="w-full">
+                            <SelectValue />
+                        </SelectTrigger>
+                        <SelectContent>
+                            <SelectItem value="interval">{t('accounts.scheduleModeInterval')}</SelectItem>
+                            <SelectItem value="cron">{t('accounts.scheduleModeCron')}</SelectItem>
+                        </SelectContent>
+                    </Select>
+                </FormItem>
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+                    {scheduleMode === 'interval' ? (
+                        <FormField
+                            control={control}
+                            name="download_interval_min"
+                            render={({ field }) => (
+                                <FormItem>
+                                    <FormLabel>{t('accounts.downloadInterval')}</FormLabel>
+                                    <FormControl>
+                                        <Input type="number" {...field} onChange={(e) => field.onChange(parseInt(e.target.value, 10))} />
+                                    </FormControl>
+                                    <FormMessage />
+                                    <FormDescription>
+                                        {t('accounts.downloadIntervalPlaceholder')}
+                                    </FormDescription>
+                                </FormItem>
+                            )}
+                        />
+                    ) : (
+                        <div className="space-y-3">
+                            <div className="flex items-center gap-2">
+                                {/* <FormLabel className="text-sm font-medium">{t('accounts.downloadSchedule')}</FormLabel> */}
+                                <div className="flex items-center rounded-md border text-xs">
+                                    <button
+                                        type="button"
+                                        className={`px-2 py-1 rounded-l-md ${cronMode === 'simple' ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:text-foreground'}`}
+                                        onClick={() => setCronMode('simple')}
+                                    >
+                                        {t('accounts.cronSimple')}
+                                    </button>
+                                    <button
+                                        type="button"
+                                        className={`px-2 py-1 rounded-r-md ${cronMode === 'advanced' ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:text-foreground'}`}
+                                        onClick={() => setCronMode('advanced')}
+                                    >
+                                        {t('accounts.cronAdvanced')}
+                                    </button>
+                                </div>
+                            </div>
+
+                            {cronMode === 'simple' ? (
+                                <div className="flex flex-wrap items-end gap-3">
+                                    <FormItem className="w-[140px]">
+                                        <FormLabel className="text-xs">{t('accounts.cronFrequency')}</FormLabel>
+                                        <Select
+                                            value={cronSimple.frequency}
+                                            onValueChange={(v) => updateCronFromSimple({ frequency: v as CronFrequency })}
+                                        >
+                                            <SelectTrigger>
+                                                <SelectValue />
+                                            </SelectTrigger>
+                                            <SelectContent>
+                                                <SelectItem value="daily">{t('accounts.cronDaily')}</SelectItem>
+                                                <SelectItem value="weekly">{t('accounts.cronWeekly')}</SelectItem>
+                                                <SelectItem value="monthly">{t('accounts.cronMonthly')}</SelectItem>
+                                            </SelectContent>
+                                        </Select>
+                                    </FormItem>
+
+                                    <FormItem className="w-[80px]">
+                                        <FormLabel className="text-xs">{t('accounts.cronHour')}</FormLabel>
+                                        <Select
+                                            value={String(cronSimple.hour)}
+                                            onValueChange={(v) => updateCronFromSimple({ hour: parseInt(v, 10) })}
+                                        >
+                                            <SelectTrigger>
+                                                <SelectValue />
+                                            </SelectTrigger>
+                                            <SelectContent>
+                                                {Array.from({ length: 24 }, (_, i) => (
+                                                    <SelectItem key={i} value={String(i)}>
+                                                        {String(i).padStart(2, '0')}
+                                                    </SelectItem>
+                                                ))}
+                                            </SelectContent>
+                                        </Select>
+                                    </FormItem>
+
+                                    <span className="text-muted-foreground pb-2">:</span>
+
+                                    <FormItem className="w-[80px]">
+                                        <FormLabel className="text-xs">{t('accounts.cronMinute')}</FormLabel>
+                                        <Select
+                                            value={String(cronSimple.minute)}
+                                            onValueChange={(v) => updateCronFromSimple({ minute: parseInt(v, 10) })}
+                                        >
+                                            <SelectTrigger>
+                                                <SelectValue />
+                                            </SelectTrigger>
+                                            <SelectContent>
+                                                {[0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55].map((m) => (
+                                                    <SelectItem key={m} value={String(m)}>
+                                                        {String(m).padStart(2, '0')}
+                                                    </SelectItem>
+                                                ))}
+                                            </SelectContent>
+                                        </Select>
+                                    </FormItem>
+
+                                    {cronSimple.frequency === 'weekly' && (
+                                        <FormItem className="w-[140px]">
+                                            <FormLabel className="text-xs">{t('accounts.cronDayOfWeek')}</FormLabel>
+                                            <Select
+                                                value={String(cronSimple.dayOfWeek)}
+                                                onValueChange={(v) => updateCronFromSimple({ dayOfWeek: parseInt(v, 10) })}
+                                            >
+                                                <SelectTrigger>
+                                                    <SelectValue />
+                                                </SelectTrigger>
+                                                <SelectContent>
+                                                    <SelectItem value="1">{t('accounts.cronMonday')}</SelectItem>
+                                                    <SelectItem value="2">{t('accounts.cronTuesday')}</SelectItem>
+                                                    <SelectItem value="3">{t('accounts.cronWednesday')}</SelectItem>
+                                                    <SelectItem value="4">{t('accounts.cronThursday')}</SelectItem>
+                                                    <SelectItem value="5">{t('accounts.cronFriday')}</SelectItem>
+                                                    <SelectItem value="6">{t('accounts.cronSaturday')}</SelectItem>
+                                                    <SelectItem value="0">{t('accounts.cronSunday')}</SelectItem>
+                                                </SelectContent>
+                                            </Select>
+                                        </FormItem>
+                                    )}
+
+                                    {cronSimple.frequency === 'monthly' && (
+                                        <FormItem className="w-[90px]">
+                                            <FormLabel className="text-xs">{t('accounts.cronDayOfMonth')}</FormLabel>
+                                            <Select
+                                                value={String(cronSimple.dayOfMonth)}
+                                                onValueChange={(v) => updateCronFromSimple({ dayOfMonth: parseInt(v, 10) })}
+                                            >
+                                                <SelectTrigger>
+                                                    <SelectValue />
+                                                </SelectTrigger>
+                                                <SelectContent className="max-h-[200px]">
+                                                    {Array.from({ length: 28 }, (_, i) => i + 1).map((d) => (
+                                                        <SelectItem key={d} value={String(d)}>
+                                                            {d}
+                                                        </SelectItem>
+                                                    ))}
+                                                </SelectContent>
+                                            </Select>
+                                        </FormItem>
+                                    )}
+
+                                    <div className="text-xs text-muted-foreground pb-2 font-mono">
+                                        = {buildCronFromSimple(cronSimple)}
+                                    </div>
+                                </div>
+                            ) : (
+                                <FormField
+                                    control={control}
+                                    name="download_schedule"
+                                    render={({ field }) => (
+                                        <FormItem>
+                                            <FormControl>
+                                                <Input
+                                                    {...field}
+                                                    value={field.value ?? ''}
+                                                    placeholder={t('accounts.downloadSchedulePlaceholder')}
+                                                />
+                                            </FormControl>
+                                            <FormDescription>
+                                                {t('accounts.downloadScheduleDescription')}
+                                            </FormDescription>
+                                            <FormMessage />
+                                        </FormItem>
+                                    )}
+                                />
+                            )}
+
+                            {cronMode === 'simple' && (
+                                <FormDescription>{t('accounts.downloadScheduleDescription')}</FormDescription>
+                            )}
+
+                            <div className="text-xs text-muted-foreground mt-1 flex items-center gap-1">
+                                <span>{t('accounts.cronTimezoneNote')}</span>
+                            </div>
+                        </div>
                    )}
-                />
-                <FormField
-                    control={control}
-                    name="download_batch_size"
-                    render={({ field }) => (
-                        <FormItem>
-                            <FormLabel>{t('accounts.downloadBatchSize')}</FormLabel>
-                            <FormControl>
-                                <Input type="number" {...field} onChange={(e) => field.onChange(parseInt(e.target.value, 10))} />
-                            </FormControl>
-                            <FormMessage />
-                            <FormDescription>
-                                {t('accounts.downloadBatchSizeDescription')}
-                            </FormDescription>
-                        </FormItem>
-                    )}
-                />
+                    <FormField
+                        control={control}
+                        name="download_batch_size"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>{t('accounts.downloadBatchSize')}</FormLabel>
+                                <FormControl>
+                                    <Input type="number" {...field} onChange={(e) => field.onChange(parseInt(e.target.value, 10))} />
+                                </FormControl>
+                                <FormMessage />
+                                <FormDescription>
+                                    {t('accounts.downloadBatchSizeDescription')}
+                                </FormDescription>
+                            </FormItem>
+                        )}
+                    />
+                </div>
            </div>

            <FormField
@@ -249,29 +530,6 @@ export default function Step3() {
            />

            <hr className="my-4" />
-
-            <FormField
-                control={control}
-                name="folder_limit"
-                render={({ field }) => (
-                    <FormItem>
-                        <FormLabel>{t('accounts.folderLimit')}</FormLabel>
-                        <FormDescription>{t('accounts.folderLimitDescription')}</FormDescription>
-                        <FormControl>
-                            <Input
-                                type="number"
-                                placeholder={t('accounts.folderLimitPlaceholder')}
-                                value={field.value ?? ''}
-                                onChange={(e) => {
-                                    const value = e.target.value;
-                                    field.onChange(value === '' ? null : Number(value));
-                                }}
-                            />
-                        </FormControl>
-                        <FormMessage />
-                    </FormItem>
-                )}
-            />
        </div>
    );
 }
--- a/web/src/features/accounts/components/step4.tsx
+++ b/web/src/features/accounts/components/step4.tsx
@@ -50,7 +50,7 @@ export default function Step4() {

    return (
        <div className="rounded-xl">
-            <Accordion type="multiple" defaultValue={['email', 'account_name', 'login_name', 'imap', 'date_since', 'folder_limit', 'sync_interval', 'sync_scope', 'sync_batch_size']}>
+            <Accordion type="multiple" defaultValue={['email', 'account_name', 'login_name', 'imap', 'date_since', 'sync_interval', 'sync_scope', 'sync_batch_size', 'download_schedule']}>
                <AccordionItem key="email" value="email">
                    <AccordionTrigger className="font-medium capitalize text-gray-600">{t('accounts.email')}:</AccordionTrigger>
                    <AccordionContent>{summaryData.email}</AccordionContent>
@@ -154,11 +154,6 @@ export default function Step4() {
                </AccordionItem>


-                <AccordionItem key="folder_limit" value="folder_limit">
-                    <AccordionTrigger className="font-medium capitalize text-gray-600">{t('accounts.folderLimit')}:</AccordionTrigger>
-                    <AccordionContent>{summaryData.folder_limit ?? t('accounts.notAvailable')}</AccordionContent>
-                </AccordionItem>
-
                <AccordionItem key="sync_interval" value="sync_interval">
                    <AccordionTrigger className="font-medium capitalize text-gray-600">{t('accounts.downloadInterval')}:</AccordionTrigger>
                    <AccordionContent>{summaryData.download_interval_min} {t('accounts.minutes')}</AccordionContent>
@@ -169,6 +164,11 @@ export default function Step4() {
                    <AccordionContent>{summaryData.download_batch_size}</AccordionContent>
                </AccordionItem>

+                <AccordionItem key="download_schedule" value="download_schedule">
+                    <AccordionTrigger className="font-medium capitalize text-gray-600">{t('accounts.downloadSchedule')}:</AccordionTrigger>
+                    <AccordionContent>{summaryData.download_schedule || t('accounts.notAvailable')}</AccordionContent>
+                </AccordionItem>
+
                <AccordionItem key="auto_download_new_mailboxes" value="auto_download_new_mailboxes">
                    <AccordionTrigger className="font-medium capitalize text-gray-600">{t('accounts.autoDownloadNewMailboxes')}:</AccordionTrigger>
                    <AccordionContent>{summaryData.auto_download_new_mailboxes ? t('common.yes') : t('common.no')}</AccordionContent>
--- a/web/src/features/attachment/mail-message-view.tsx
+++ b/web/src/features/attachment/mail-message-view.tsx
@@ -19,7 +19,7 @@

 import { useEffect, useState } from 'react';
 import { useMutation } from '@tanstack/react-query';
-import { Loader, Download, Trash2, MessageSquareMore, FileText, FileImage, FileVideo, FileArchive, FileSpreadsheet, FileCode, FileIcon, FileAudio, Upload } from 'lucide-react';
+import { Loader, Download, Trash2, MessageSquareMore, FileText, FileImage, FileVideo, FileArchive, FileSpreadsheet, FileCode, FileIcon, FileAudio, Upload, ShieldCheck } from 'lucide-react';

 import { Button } from '@/components/ui/button';
 import { Separator } from '@/components/ui/separator';
@@ -121,6 +121,12 @@ export function MailMessageView({
  const [nestedEmlFile, setNestedEmlFile] = useState<AttachmentInfo | null>(null);
  const { getEmailById } = useMinimalAccountList();
  const [threadOpen, setThreadOpen] = useState(false);
+  const [blockRemote, setBlockRemote] = useState(true);
+  const [hasRemoteContent, setHasRemoteContent] = useState(false);
+
+  const toggleBlockRemote = () => {
+    setBlockRemote((prev) => !prev);
+  };

  const downloadAttachmentMutation = useMutation({
    mutationFn: ({ content_hash }: { content_hash: string }) =>
@@ -137,12 +143,13 @@ export function MailMessageView({
  });

  const loadMessageMutation = useMutation({
-    mutationFn: () => load_message(envelope.account_id, envelope.id),
+    mutationFn: () => load_message(envelope.account_id, envelope.id, blockRemote),
    onSuccess: (data) => {
      setLoading(false);
      setContent(getContent(data));
      if (data.attachments) setAttachments(data.attachments);
      setContentType(data.html ? 'Html' : 'Plain');
+      setHasRemoteContent(!!data.has_remote_content);
    },
    onError: (error: any) => {
      setLoading(false);
@@ -154,10 +161,14 @@ export function MailMessageView({
    },
  });

+  useEffect(() => {
+    setBlockRemote(true);
+  }, [envelope.id]);
+
  useEffect(() => {
    setLoading(true);
    loadMessageMutation.mutate();
-  }, [envelope.id]);
+  }, [envelope.id, blockRemote]);


  const handleViewNestedEml = (attachment: AttachmentInfo) => {
@@ -376,6 +387,30 @@ export function MailMessageView({
        </div>
      )}
      {showAttachments && <Separator className="mb-2" />}
+      {hasRemoteContent && (
+        <div className="flex items-center justify-between bg-muted border px-3 py-1.5 mb-3 text-xs">
+          <div className="flex items-center gap-1.5 min-w-0">
+            <ShieldCheck className="h-3.5 w-3.5 text-muted-foreground shrink-0" />
+            {blockRemote ? (
+              <span className="text-muted-foreground truncate">
+                {t('mail.remoteBlocked', 'To protect your privacy, Bichon has blocked remote content in this message.')}
+              </span>
+            ) : (
+              <span className="text-muted-foreground truncate">
+                {t('mail.remoteShown', 'Remote content is now shown.')}
+              </span>
+            )}
+          </div>
+          <span
+            className="underline cursor-pointer hover:no-underline text-muted-foreground text-[11px] font-medium shrink-0 ml-2 select-none"
+            onClick={toggleBlockRemote}
+          >
+            {blockRemote
+              ? t('mail.showRemoteContent', 'Show remote content')
+              : t('mail.blockRemoteAgain', 'Block again')}
+          </span>
+        </div>
+      )}
      <div className="flex-1 overflow-auto">
        {loading ? (
          <div className="flex justify-center items-center py-8">
--- a/web/src/features/attachment/nested-email-dialog.tsx
+++ b/web/src/features/attachment/nested-email-dialog.tsx
@@ -150,7 +150,7 @@ export function NestedEmailDialog({ open, onOpenChange }: any) {

    const { data, isLoading } = useQuery({
        queryKey: ['nested-message', currentAttachment?.account_id!, currentAttachment?.envelope_id!, currentAttachment?.content_hash!],
-        queryFn: () => load_nested_message(currentAttachment?.account_id!, currentAttachment?.envelope_id!, currentAttachment?.content_hash!),
+        queryFn: () => load_nested_message(currentAttachment?.account_id!, currentAttachment?.envelope_id!, currentAttachment?.content_hash!, true),
        enabled: open && !!currentAttachment,
    });

--- a/web/src/features/search/mail-message-view.tsx
+++ b/web/src/features/search/mail-message-view.tsx
@@ -19,7 +19,7 @@

 import { useEffect, useState } from 'react';
 import { useMutation } from '@tanstack/react-query';
-import { Loader, Download, Trash2, MessageSquareMore, FileText, FileImage, FileVideo, FileArchive, FileSpreadsheet, FileCode, FileIcon, FileAudio, Upload } from 'lucide-react';
+import { Loader, Download, Trash2, MessageSquareMore, FileText, FileImage, FileVideo, FileArchive, FileSpreadsheet, FileCode, FileIcon, FileAudio, Upload, ShieldCheck } from 'lucide-react';

 import { Button } from '@/components/ui/button';
 import { Separator } from '@/components/ui/separator';
@@ -129,6 +129,12 @@ export function MailMessageView({
  const [nestedEmlFile, setNestedEmlFile] = useState<AttachmentInfo | null>(null);
  const { getEmailById } = useMinimalAccountList();
  const [threadOpen, setThreadOpen] = useState(false);
+  const [blockRemote, setBlockRemote] = useState(true);
+  const [hasRemoteContent, setHasRemoteContent] = useState(false);
+
+  const toggleBlockRemote = () => {
+    setBlockRemote((prev) => !prev);
+  };

  const downloadAttachmentMutation = useMutation({
    mutationFn: ({ content_hash }: { content_hash: string }) =>
@@ -145,12 +151,13 @@ export function MailMessageView({
  });

  const loadMessageMutation = useMutation({
-    mutationFn: () => load_message(envelope.account_id, envelope.id),
+    mutationFn: () => load_message(envelope.account_id, envelope.id, blockRemote),
    onSuccess: (data) => {
      setLoading(false);
      setContent(getContent(data));
      if (data.attachments) setAttachments(data.attachments);
      setContentType(data.html ? 'Html' : 'Plain');
+      setHasRemoteContent(!!data.has_remote_content);
    },
    onError: (error: any) => {
      setLoading(false);
@@ -162,10 +169,14 @@ export function MailMessageView({
    },
  });

+  useEffect(() => {
+    setBlockRemote(true);
+  }, [envelope.id]);
+
  useEffect(() => {
    setLoading(true);
    loadMessageMutation.mutate();
-  }, [envelope.id]);
+  }, [envelope.id, blockRemote]);


  const handleViewNestedEml = (attachment: AttachmentInfo) => {
@@ -384,6 +395,30 @@ export function MailMessageView({
        </div>
      )}
      {showAttachments && <Separator className="mb-2" />}
+      {hasRemoteContent && (
+        <div className="flex items-center justify-between bg-muted border px-3 py-1.5 mb-3 text-xs">
+          <div className="flex items-center gap-1.5 min-w-0">
+            <ShieldCheck className="h-3.5 w-3.5 text-muted-foreground shrink-0" />
+            {blockRemote ? (
+              <span className="text-muted-foreground truncate">
+                {t('mail.remoteBlocked', 'To protect your privacy, Bichon has blocked remote content in this message.')}
+              </span>
+            ) : (
+              <span className="text-muted-foreground truncate">
+                {t('mail.remoteShown', 'Remote content is now shown.')}
+              </span>
+            )}
+          </div>
+          <span
+            className="underline cursor-pointer hover:no-underline text-muted-foreground text-[11px] font-medium shrink-0 ml-2 select-none"
+            onClick={toggleBlockRemote}
+          >
+            {blockRemote
+              ? t('mail.showRemoteContent', 'Show remote content')
+              : t('mail.blockRemoteAgain', 'Block again')}
+          </span>
+        </div>
+      )}
      <div className="flex-1 overflow-auto">
        {loading ? (
          <div className="flex justify-center items-center py-8">
--- a/web/src/features/search/nested-email-dialog.tsx
+++ b/web/src/features/search/nested-email-dialog.tsx
@@ -148,7 +148,7 @@ export function NestedEmailDialog({ open, onOpenChange, accountId, envelopeId, f

    const { data, isLoading } = useQuery({
        queryKey: ['nested-message', accountId, envelopeId, content_hash],
-        queryFn: () => load_nested_message(accountId, envelopeId, content_hash),
+        queryFn: () => load_nested_message(accountId, envelopeId, content_hash, true),
        enabled: open && !!content_hash,
    });

--- a/web/src/locales/ar.json
+++ b/web/src/locales/ar.json
@@ -100,6 +100,7 @@
    "auth": "المصادقة",
    "authType": "نوع_المصادقة",
    "autoConfiguring": "جارٍ التكوين التلقائي...",
+    "autoDownloadNewMailboxes": "إضافة المجلدات الجديدة تلقائيًا",
    "autoDownloadNewMailboxesDescription": "إضافة المجلدات الجديدة المكتشفة تلقائيًا إلى قائمة التنزيل.",
    "beforeRelative": "تنزيل رسائل البريد الإلكتروني القديمة فقط",
    "beforeRelativeValue": "تنزيل رسائل البريد الإلكتروني قبل {{value}} {{unit}} مضت",
@@ -114,6 +115,24 @@
    "continue": "متابعة",
    "createdAt": "تاريخ الإنشاء",
    "creationFailed": "فشل الإنشاء، يرجى المحاولة مرة أخرى لاحقًا",
+    "cronAdvanced": "تعبير متقدم",
+    "cronDaily": "يومياً",
+    "cronDayOfMonth": "اليوم من الأسبوع",
+    "cronDayOfWeek": "اليوم من الأسبوع",
+    "cronFrequency": "التكرار",
+    "cronFriday": "الجمعة",
+    "cronHour": "الساعة",
+    "cronMinute": "الدقيقة",
+    "cronMonday": "الإثنين",
+    "cronMonthly": "شهرياً",
+    "cronSaturday": "السبت",
+    "cronSimple": "تعبير بسيط",
+    "cronSunday": "الأحد",
+    "cronThursday": "الخميس",
+    "cronTimezoneNote": "جميع الأوقات بالتوقيت المحلي للخادم.",
+    "cronTuesday": "الثلاثاء",
+    "cronWednesday": "الأربعاء",
+    "cronWeekly": "أسبوعياً",
    "dateSelection": "تحديد التاريخ",
    "dateSince": "التاريخ منذ",
    "days": "أيام",
@@ -132,6 +151,9 @@
    "downloadFailed": "فشل بدء مهمة التنزيل",
    "downloadInterval": "دورة التنزيل (بالدقائق)",
    "downloadIntervalPlaceholder": "أدخل الدقائق",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "كرون من 6 حقول (ثانية-دقائق-ساعات-يوم-شهر-أسبوع) بتوقيت الخادم. يتجاوز الفاصل الزمني.",
+    "downloadSchedulePlaceholder": "مثال: 0 0 * * *",
    "downloadScope": "استراتيجية التنزيل",
    "downloadScopeDescription": "اختر رسائل البريد الإلكتروني التي يجب فهرستها وتنزيلها.",
    "downloadStarted": "بدأت مهمة التنزيل",
@@ -155,9 +177,6 @@
    "everyMinutes": "كل {{minutes}} دقيقة",
    "field": "الحقل",
    "fixed": "ثابت",
-    "folderLimit": "حد المجلد",
-    "folderLimitDescription": "حدد عدد رسائل البريد الإلكتروني للمزامنة لكل مجلد (الحد الأدنى 100). اتركه فارغًا بلا حدود.",
-    "folderLimitPlaceholder": "مثال: 1000",
    "folderSync": {
      "autoSelectDescendants": "تحديد العناصر الفرعية تلقائيًا",
      "autoSelectParents": "تحديد العناصر الأصلية تلقائيًا",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "حفظ التغييرات",
+    "scheduleMode": "جدولة التنزيل",
+    "scheduleModeCron": "تعبير Cron",
+    "scheduleModeDescription": "تعيين التنزيل بفواصل زمنية ثابتة أو عبر Cron.",
+    "scheduleModeInterval": "فواصل زمنية ثابتة",
    "selectAccountType": "اختر نوع الحساب",
    "selectAtLeastOneFolder": "يرجى تحديد مجلد واحد على الأقل",
    "selectAuthMethod": "اختر طريقة مصادقة",
@@ -556,6 +579,7 @@
    "account": "الحساب",
    "attachments": "المرفقات",
    "bcc": "نسخة مخفية",
+    "blockRemoteAgain": "حظر مجدداً",
    "cc": "نسخة",
    "clickToDownload": "انقر للتنزيل",
    "date": "التاريخ",
@@ -575,8 +599,11 @@
    "noMessageSelected": "لم يتم تحديد رسالة",
    "noTagsYet": "لا توجد علامات بعد",
    "onlyNonInlineAttachments": "يتم عرض المرفقات غير المضمنة فقط هنا.",
+    "remoteBlocked": "لحماية خصوصيتك، قام Bichon بحظر المحتوى الخارجي في هذه الرسالة.",
+    "remoteShown": "تم عرض المحتوى الخارجي.",
    "showLess": "إظهار أقل",
    "showMore": "إظهار المزيد...",
+    "showRemoteContent": "عرض المحتوى الخارجي",
    "subject": "الموضوع",
    "tags": "العلامات",
    "to": "إلى",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "البريد الإلكتروني مطلوب",
-    "folderLimitMustBeAtLeast100": "يجب أن يكون حد المجلد 100 على الأقل",
-    "folderLimitMustBeNumber": "يجب أن يكون حد المجلد رقمًا",
    "imapHostCannotBeEmpty": "لا يمكن أن يكون مُضيف IMAP فارغًا",
    "imapHostRequired": "مُضيف IMAP مطلوب",
    "imapPortMustBeLessThan65536": "يجب أن يكون منفذ IMAP أقل من 65536",
    "imapPortMustBePositive": "يجب أن يكون منفذ IMAP عددًا صحيحًا موجبًا",
    "incrementalSyncMustBeAtLeast10": "يجب أن يكون فاصل المزامنة التزايدية 10 دقائق على الأقل",
    "incrementalSyncMustBeNumber": "يجب أن يكون فاصل المزامنة التزايدية رقمًا",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "عنوان بريد إلكتروني غير صالح",
    "invalidUrl": "عنوان URL غير صالح",
    "passwordMinLength": "يجب أن تتكون كلمة المرور من {{min}} أحرف على الأقل",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "يجب أن يكون حجم الدُفعة على الأكثر 200",
    "singleRequestBatchSizeTooSmall": "يجب أن يكون حجم الدُفعة على الأقل 10"
  }
-}
+}
--- a/web/src/locales/da.json
+++ b/web/src/locales/da.json
@@ -100,6 +100,7 @@
    "auth": "Godkendelse",
    "authType": "godkendelsestype",
    "autoConfiguring": "Konfigurerer automatisk...",
+    "autoDownloadNewMailboxes": "Tilføj automatisk nye mapper",
    "autoDownloadNewMailboxesDescription": "Føj automatisk nye mapper til downloadlisten.",
    "beforeRelative": "Download kun gamle e-mails",
    "beforeRelativeValue": "Download e-mails før {{value}} {{unit}} siden",
@@ -114,6 +115,24 @@
    "continue": "Fortsæt",
    "createdAt": "Oprettet",
    "creationFailed": "Oprettelse mislykkedes, prøv venligst igen senere",
+    "cronAdvanced": "Avanceret udtryk",
+    "cronDaily": "Dagligt",
+    "cronDayOfMonth": "Ugedag",
+    "cronDayOfWeek": "Ugedag",
+    "cronFrequency": "Frekvens",
+    "cronFriday": "Fredag",
+    "cronHour": "Time",
+    "cronMinute": "Minut",
+    "cronMonday": "Mandag",
+    "cronMonthly": "Månedligt",
+    "cronSaturday": "Lørdag",
+    "cronSimple": "Simpelt udtryk",
+    "cronSunday": "Søndag",
+    "cronThursday": "Torsdag",
+    "cronTimezoneNote": "Alle tider er serverens lokale tid.",
+    "cronTuesday": "Tirsdag",
+    "cronWednesday": "Onsdag",
+    "cronWeekly": "Ugentligt",
    "dateSelection": "Datovalg",
    "dateSince": "Dato fra",
    "days": "Dage",
@@ -132,6 +151,9 @@
    "downloadFailed": "Kunne ikke starte download-opgave",
    "downloadInterval": "Downloadinterval (minutter)",
    "downloadIntervalPlaceholder": "Indtast minutter",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "6-felters Cron (sek min time dag mdr ugedag) i servertid. Tilsidesætter interval.",
+    "downloadSchedulePlaceholder": "F.eks.: 0 0 * * *",
    "downloadScope": "Downloadstrategi",
    "downloadScopeDescription": "Vælg hvilke e-mails der skal indekseres og downloades.",
    "downloadStarted": "Download-opgave startet",
@@ -155,9 +177,6 @@
    "everyMinutes": "hvert {{minutes}} minut",
    "field": "Felt",
    "fixed": "Fast",
-    "folderLimit": "Mappegrænse",
-    "folderLimitDescription": "Begræns antallet af e-mails, der skal synkroniseres pr. mappe (minimum 100). Lad stå tomt for ingen grænse.",
-    "folderLimitPlaceholder": "f.eks. 1000",
    "folderSync": {
      "autoSelectDescendants": "Vælg efterkommere automatisk",
      "autoSelectParents": "Vælg forældre automatisk",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Gem ændringer",
+    "scheduleMode": "Planlægning af download",
+    "scheduleModeCron": "Cron-udtryk",
+    "scheduleModeDescription": "Download via faste intervaller eller Cron.",
+    "scheduleModeInterval": "Fast interval",
    "selectAccountType": "Vælg kontotype",
    "selectAtLeastOneFolder": "Vælg venligst mindst én mappe",
    "selectAuthMethod": "Vælg en godkendelsesmetode",
@@ -556,6 +579,7 @@
    "account": "Konto",
    "attachments": "Vedhæftninger",
    "bcc": "Blindkopi",
+    "blockRemoteAgain": "Bloker igen",
    "cc": "Kopi",
    "clickToDownload": "Klik for at downloade",
    "date": "Dato",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Ingen meddelelse valgt",
    "noTagsYet": "Ingen etiketter endnu",
    "onlyNonInlineAttachments": "Kun ikke-indlejrede vedhæftninger vises her.",
+    "remoteBlocked": "For at beskytte dit privatliv har Bichon blokeret eksternt indhold i denne meddelelse.",
+    "remoteShown": "Eksternt indhold vises nu.",
    "showLess": "vis mindre",
    "showMore": "vis mere...",
+    "showRemoteContent": "Vis eksternt indhold",
    "subject": "Emne",
    "tags": "Etiketter",
    "to": "Til",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "E-mail er påkrævet",
-    "folderLimitMustBeAtLeast100": "Mappegrænse skal være mindst 100",
-    "folderLimitMustBeNumber": "Mappegrænse skal være et tal",
    "imapHostCannotBeEmpty": "IMAP-vært kan ikke være tom",
    "imapHostRequired": "IMAP-vært er påkrævet",
    "imapPortMustBeLessThan65536": "IMAP-port skal være mindre end 65536",
    "imapPortMustBePositive": "IMAP-port skal være et positivt heltal",
    "incrementalSyncMustBeAtLeast10": "Inkrementelt synkroniseringsinterval skal være mindst 10 minutter",
    "incrementalSyncMustBeNumber": "Inkrementelt synkroniseringsinterval skal være et tal",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Ugyldig e-mailadresse",
    "invalidUrl": "Ugyldig URL",
    "passwordMinLength": "Adgangskoden skal være mindst {{min}} tegn lang",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "Batch‑størrelse skal være højst 200",
    "singleRequestBatchSizeTooSmall": "Batch‑størrelse skal være mindst 10"
  }
-}
+}
--- a/web/src/locales/de.json
+++ b/web/src/locales/de.json
@@ -100,6 +100,7 @@
    "auth": "Authentifizierung",
    "authType": "Authentifizierungstyp",
    "autoConfiguring": "Automatische Konfiguration läuft...",
+    "autoDownloadNewMailboxes": "Neue Ordner automatisch hinzufügen",
    "autoDownloadNewMailboxesDescription": "Neu entdeckte Ordner automatisch zur Download-Liste hinzufügen.",
    "beforeRelative": "Nur alte E-Mails herunterladen",
    "beforeRelativeValue": "E-Mails von vor {{value}} {{unit}} herunterladen",
@@ -114,6 +115,24 @@
    "continue": "Weiter",
    "createdAt": "Erstellt am",
    "creationFailed": "Erstellung fehlgeschlagen, bitte versuchen Sie es später erneut",
+    "cronAdvanced": "Erweiterter Ausdruck",
+    "cronDaily": "Täglich",
+    "cronDayOfMonth": "Wochentag",
+    "cronDayOfWeek": "Wochentag",
+    "cronFrequency": "Häufigkeit",
+    "cronFriday": "Freitag",
+    "cronHour": "Stunde",
+    "cronMinute": "Minute",
+    "cronMonday": "Montag",
+    "cronMonthly": "Monatlich",
+    "cronSaturday": "Samstag",
+    "cronSimple": "Einfacher Ausdruck",
+    "cronSunday": "Sonntag",
+    "cronThursday": "Donnerstag",
+    "cronTimezoneNote": "Alle Zeiten nutzen Server-Ortszeit.",
+    "cronTuesday": "Dienstag",
+    "cronWednesday": "Mittwoch",
+    "cronWeekly": "Wöchentlich",
    "dateSelection": "Datumsauswahl",
    "dateSince": "Datum seit",
    "days": "Tage",
@@ -132,6 +151,9 @@
    "downloadFailed": "Download-Aufgabe konnte nicht gestartet werden",
    "downloadInterval": "Download-Intervall (Minuten)",
    "downloadIntervalPlaceholder": "Minuten eingeben",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "6-Felder-Cron (Sek Min Std Tag Mon Wochentag) in Serverzeit. Ersetzt Intervall.",
+    "downloadSchedulePlaceholder": "Z. B.: 0 0 * * *",
    "downloadScope": "Download-Strategie",
    "downloadScopeDescription": "Wählen Sie aus, welche E-Mails indiziert und heruntergeladen werden sollen.",
    "downloadStarted": "Download-Aufgabe gestartet",
@@ -155,9 +177,6 @@
    "everyMinutes": "alle {{minutes}} Minuten",
    "field": "Feld",
    "fixed": "Fest",
-    "folderLimit": "Ordnerlimit",
-    "folderLimitDescription": "Begrenzen Sie die Anzahl der pro Ordner zu synchronisierenden E-Mails (mindestens 100). Lassen Sie das Feld leer für keine Begrenzung.",
-    "folderLimitPlaceholder": "z.B. 1000",
    "folderSync": {
      "autoSelectDescendants": "Unterelemente automatisch auswählen",
      "autoSelectParents": "Elternelemente automatisch auswählen",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Änderungen speichern",
+    "scheduleMode": "Download-Zeitplan",
+    "scheduleModeCron": "Cron-Ausdruck",
+    "scheduleModeDescription": "Download nach festem Intervall oder Cron-Ausdruck.",
+    "scheduleModeInterval": "Festes Intervall",
    "selectAccountType": "Kontotyp auswählen",
    "selectAtLeastOneFolder": "Wählen Sie mindestens einen Ordner aus",
    "selectAuthMethod": "Authentifizierungsmethode auswählen",
@@ -556,6 +579,7 @@
    "account": "Konto",
    "attachments": "Anhänge",
    "bcc": "BCC",
+    "blockRemoteAgain": "Wieder blockieren",
    "cc": "CC",
    "clickToDownload": "Zum Herunterladen klicken",
    "date": "Datum",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Keine Nachricht ausgewählt",
    "noTagsYet": "Noch keine Tags",
    "onlyNonInlineAttachments": "Es werden nur Nicht-Inline-Anhänge hier angezeigt.",
+    "remoteBlocked": "Zum Schutz Ihrer Privatsphäre hat Bichon externe Inhalte in dieser Nachricht blockiert.",
+    "remoteShown": "Externe Inhalte werden angezeigt.",
    "showLess": "weniger anzeigen",
    "showMore": "mehr anzeigen...",
+    "showRemoteContent": "Externe Inhalte anzeigen",
    "subject": "Betreff",
    "tags": "Tags",
    "to": "An",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "E-Mail ist erforderlich",
-    "folderLimitMustBeAtLeast100": "Das Ordnerlimit muss mindestens 100 betragen",
-    "folderLimitMustBeNumber": "Das Ordnerlimit muss eine Zahl sein",
    "imapHostCannotBeEmpty": "IMAP-Host darf nicht leer sein",
    "imapHostRequired": "IMAP-Host ist erforderlich",
    "imapPortMustBeLessThan65536": "Der IMAP-Port muss kleiner als 65536 sein",
    "imapPortMustBePositive": "Der IMAP-Port muss eine positive ganze Zahl sein",
    "incrementalSyncMustBeAtLeast10": "Das inkrementelle Synchronisierungsintervall muss mindestens 10 Minuten betragen",
    "incrementalSyncMustBeNumber": "Das inkrementelle Synchronisierungsintervall muss eine Zahl sein",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Ungültige E-Mail-Adresse",
    "invalidUrl": "Ungültige URL",
    "passwordMinLength": "Das Passwort muss mindestens {{min}} Zeichen lang sein",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "Die Stapelgröße darf höchstens 200 sein",
    "singleRequestBatchSizeTooSmall": "Die Stapelgröße muss mindestens 10 sein"
  }
-}
+}
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -115,6 +115,24 @@
    "continue": "Continue",
    "createdAt": "Created At",
    "creationFailed": "Creation failed, please try again later",
+    "cronAdvanced": "Advanced Expression",
+    "cronDaily": "Daily",
+    "cronDayOfMonth": "Day of Week",
+    "cronDayOfWeek": "Day of Week",
+    "cronFrequency": "Frequency",
+    "cronFriday": "Friday",
+    "cronHour": "Hour",
+    "cronMinute": "Minute",
+    "cronMonday": "Monday",
+    "cronMonthly": "Monthly",
+    "cronSaturday": "Saturday",
+    "cronSimple": "Simple Expression",
+    "cronSunday": "Sunday",
+    "cronThursday": "Thursday",
+    "cronTimezoneNote": "All times use server local timezone.",
+    "cronTuesday": "Tuesday",
+    "cronWednesday": "Wednesday",
+    "cronWeekly": "Weekly",
    "dateSelection": "Date Selection",
    "dateSince": "Date Since",
    "days": "Days",
@@ -133,6 +151,9 @@
    "downloadFailed": "Failed to start download task",
    "downloadInterval": "Download Interval (minutes)",
    "downloadIntervalPlaceholder": "Enter minutes",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "6-field Cron (sec min hour day month dow) in server time. Overrides interval.",
+    "downloadSchedulePlaceholder": "e.g., 0 0 * * *",
    "downloadScope": "Download Strategy",
    "downloadScopeDescription": "Choose which emails should be indexed and downloaded.",
    "downloadStarted": "Download task started",
@@ -156,9 +177,6 @@
    "everyMinutes": "every {{minutes}} minutes",
    "field": "Field",
    "fixed": "Fixed",
-    "folderLimit": "Folder Limit",
-    "folderLimitDescription": "Limit the number of emails to sync per folder (minimum 100). Leave empty for no limit.",
-    "folderLimitPlaceholder": "e.g. 1000",
    "folderSync": {
      "autoSelectDescendants": "Auto select descendants",
      "autoSelectParents": "Auto select parents",
@@ -247,6 +265,10 @@
      }
    },
    "saveChanges": "Save changes",
+    "scheduleMode": "Download Schedule",
+    "scheduleModeCron": "Cron Expression",
+    "scheduleModeDescription": "Download via fixed intervals or Cron expressions.",
+    "scheduleModeInterval": "Fixed Interval",
    "selectAccountType": "Select account type",
    "selectAtLeastOneFolder": "Please select at least one folder",
    "selectAuthMethod": "Select an authentication method",
@@ -557,6 +579,7 @@
    "account": "Account",
    "attachments": "Attachments",
    "bcc": "BCC",
+    "blockRemoteAgain": "Block again",
    "cc": "CC",
    "clickToDownload": "Click to download",
    "date": "Date",
@@ -576,8 +599,11 @@
    "noMessageSelected": "No message selected",
    "noTagsYet": "No tags yet",
    "onlyNonInlineAttachments": "Only non-inline attachments are shown here.",
+    "remoteBlocked": "To protect your privacy, Bichon has blocked remote content in this message.",
+    "remoteShown": "Remote content is now shown.",
    "showLess": "show less",
    "showMore": "show more...",
+    "showRemoteContent": "Show remote content",
    "subject": "Subject",
    "tags": "Tags",
    "to": "To",
@@ -1646,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "Email is required",
-    "folderLimitMustBeAtLeast100": "Folder limit must be at least 100",
-    "folderLimitMustBeNumber": "Folder limit must be a number",
    "imapHostCannotBeEmpty": "IMAP host cannot be empty",
    "imapHostRequired": "IMAP host is required",
    "imapPortMustBeLessThan65536": "IMAP port must be less than 65536",
    "imapPortMustBePositive": "IMAP port must be a positive integer",
    "incrementalSyncMustBeAtLeast10": "Incremental sync interval must be at least 10 minutes",
    "incrementalSyncMustBeNumber": "Incremental sync interval must be a number",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Invalid email address",
    "invalidUrl": "Invalid URL",
    "passwordMinLength": "Password must be at least {{min}} characters long",
@@ -1665,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "Batch size must be at most 200",
    "singleRequestBatchSizeTooSmall": "Batch size must be at least 10"
  }
-}
+}
--- a/web/src/locales/es.json
+++ b/web/src/locales/es.json
@@ -100,6 +100,7 @@
    "auth": "Autenticación",
    "authType": "tipo de autenticación",
    "autoConfiguring": "Autoconfigurando...",
+    "autoDownloadNewMailboxes": "Añadir automáticamente nuevas carpetas",
    "autoDownloadNewMailboxesDescription": "Añadir automáticamente las nuevas carpetas a la lista de descarga.",
    "beforeRelative": "Descargar solo correos antiguos",
    "beforeRelativeValue": "Descargar correos de hace {{value}} {{unit}}",
@@ -114,6 +115,24 @@
    "continue": "Continuar",
    "createdAt": "Creado el",
    "creationFailed": "Error al crear, por favor, inténtalo de nuevo más tarde",
+    "cronAdvanced": "Expresión avanzada",
+    "cronDaily": "Diario",
+    "cronDayOfMonth": "Día de la semana",
+    "cronDayOfWeek": "Día de la semana",
+    "cronFrequency": "Frecuencia",
+    "cronFriday": "Viernes",
+    "cronHour": "Hora",
+    "cronMinute": "Minuto",
+    "cronMonday": "Lunes",
+    "cronMonthly": "Mensual",
+    "cronSaturday": "Sábado",
+    "cronSimple": "Expresión simple",
+    "cronSunday": "Domingo",
+    "cronThursday": "Jueves",
+    "cronTimezoneNote": "Horas en zona horaria del servidor.",
+    "cronTuesday": "Martes",
+    "cronWednesday": "Miércoles",
+    "cronWeekly": "Semanal",
    "dateSelection": "Selección de fecha",
    "dateSince": "Fecha desde",
    "days": "Días",
@@ -132,6 +151,9 @@
    "downloadFailed": "Error al iniciar la tarea de descarga",
    "downloadInterval": "Intervalo de descarga (minutos)",
    "downloadIntervalPlaceholder": "Ingresa los minutos",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "Cron de 6 campos (seg min hora día mes día-sem) en hora del servidor. Anula intervalo.",
+    "downloadSchedulePlaceholder": "ej., 0 0 * * *",
    "downloadScope": "Estrategia de descarga",
    "downloadScopeDescription": "Elija qué correos electrónicos deben indexarse y descargarse.",
    "downloadStarted": "Tarea de descarga iniciada",
@@ -155,9 +177,6 @@
    "everyMinutes": "cada {{minutes}} minutos",
    "field": "Campo",
    "fixed": "Fija",
-    "folderLimit": "Límite de carpetas",
-    "folderLimitDescription": "Limita el número de correos a sincronizar por carpeta (mínimo 100). Deja vacío para no tener límite.",
-    "folderLimitPlaceholder": "ej. 1000",
    "folderSync": {
      "autoSelectDescendants": "Seleccionar automáticamente los descendientes",
      "autoSelectParents": "Seleccionar automáticamente los padres",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Guardar cambios",
+    "scheduleMode": "Programación de descarga",
+    "scheduleModeCron": "Expresión Cron",
+    "scheduleModeDescription": "Descarga por intervalos fijos o expresiones Cron.",
+    "scheduleModeInterval": "Intervalo fijo",
    "selectAccountType": "Seleccionar tipo de cuenta",
    "selectAtLeastOneFolder": "Selecciona al menos una carpeta",
    "selectAuthMethod": "Selecciona el método de autenticación",
@@ -556,6 +579,7 @@
    "account": "Cuenta",
    "attachments": "Adjuntos",
    "bcc": "CCO",
+    "blockRemoteAgain": "Bloquear de nuevo",
    "cc": "CC",
    "clickToDownload": "Hacer clic para descargar",
    "date": "Fecha",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Ningún mensaje seleccionado",
    "noTagsYet": "Aún no hay etiquetas",
    "onlyNonInlineAttachments": "Solo se muestran aquí los adjuntos que no están en línea.",
+    "remoteBlocked": "Para proteger tu privacidad, Bichon ha bloqueado el contenido remoto de este mensaje.",
+    "remoteShown": "Contenido remoto mostrado.",
    "showLess": "mostrar menos",
    "showMore": "mostrar más...",
+    "showRemoteContent": "Mostrar contenido remoto",
    "subject": "Asunto",
    "tags": "Etiquetas",
    "to": "Para",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "El correo electrónico es obligatorio",
-    "folderLimitMustBeAtLeast100": "El límite de carpetas debe ser de al menos 100",
-    "folderLimitMustBeNumber": "El límite de carpetas debe ser un número",
    "imapHostCannotBeEmpty": "El host IMAP no puede estar vacío",
    "imapHostRequired": "El host IMAP es obligatorio",
    "imapPortMustBeLessThan65536": "El puerto IMAP debe ser menor que 65536",
    "imapPortMustBePositive": "El puerto IMAP debe ser un número entero positivo",
    "incrementalSyncMustBeAtLeast10": "El intervalo de sincronización incremental debe ser de al menos 10 minutos",
    "incrementalSyncMustBeNumber": "El intervalo de sincronización incremental debe ser un número",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Dirección de correo electrónico inválida",
    "invalidUrl": "URL inválida",
    "passwordMinLength": "La contraseña debe tener al menos {{min}} caracteres",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "El tamaño del lote debe ser como máximo 200",
    "singleRequestBatchSizeTooSmall": "El tamaño del lote debe ser al menos 10"
  }
-}
+}
--- a/web/src/locales/fi.json
+++ b/web/src/locales/fi.json
@@ -100,6 +100,7 @@
    "auth": "Todennus",
    "authType": "todennustyyppi",
    "autoConfiguring": "Automaattinen määritys...",
+    "autoDownloadNewMailboxes": "Lisää uudet kansiot automaattisesti",
    "autoDownloadNewMailboxesDescription": "Lisää uudet löydetyt kansiot automaattisesti latausluetteloon.",
    "beforeRelative": "Lataa vain vanhat sähköpostit",
    "beforeRelativeValue": "Lataa sähköpostit {{value}} {{unit}} sitten",
@@ -114,6 +115,24 @@
    "continue": "Jatka",
    "createdAt": "Luotu",
    "creationFailed": "Luominen epäonnistui, yritä myöhemmin uudelleen",
+    "cronAdvanced": "Edistynyt lauseke",
+    "cronDaily": "Päivittäin",
+    "cronDayOfMonth": "Viikonpäivä",
+    "cronDayOfWeek": "Viikonpäivä",
+    "cronFrequency": "Tiheys",
+    "cronFriday": "Perjantai",
+    "cronHour": "Tunti",
+    "cronMinute": "Minuutti",
+    "cronMonday": "Maanantai",
+    "cronMonthly": "Kuukausittain",
+    "cronSaturday": "Lauantai",
+    "cronSimple": "Yksinkertainen lauseke",
+    "cronSunday": "Sunnuntai",
+    "cronThursday": "Torstai",
+    "cronTimezoneNote": "Kaikki ajat palvelimen paikallista aikaa.",
+    "cronTuesday": "Tiistai",
+    "cronWednesday": "Keskiviikko",
+    "cronWeekly": "Viikoittain",
    "dateSelection": "Päivämäärän valinta",
    "dateSince": "Päivämäärä alkaen",
    "days": "Päivää",
@@ -132,6 +151,9 @@
    "downloadFailed": "Lataustehtävän aloittaminen epäonnistui",
    "downloadInterval": "Latausväli (minuuttia)",
    "downloadIntervalPlaceholder": "Syötä minuutit",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "6-kenttäinen Cron (sek min tun pv kk vkpv) palvelimen ajassa. Korvaa aikavälin.",
+    "downloadSchedulePlaceholder": "esim. 0 0 * * *",
    "downloadScope": "Latausstrategia",
    "downloadScopeDescription": "Valitse, mitkä sähköpostit indeksoidaan ja ladataan.",
    "downloadStarted": "Lataustehtävä aloitettu",
@@ -155,9 +177,6 @@
    "everyMinutes": "joka {{minutes}} minuutti",
    "field": "Kenttä",
    "fixed": "Kiinteä",
-    "folderLimit": "Kansioraja",
-    "folderLimitDescription": "Rajoittaa synkronoitavien sähköpostien määrän kansiota kohden (vähintään 100). Jätä tyhjäksi ilman rajoitusta.",
-    "folderLimitPlaceholder": "esim. 1000",
    "folderSync": {
      "autoSelectDescendants": "Valitse alisolmut automaattisesti",
      "autoSelectParents": "Valitse yläsolmut automaattisesti",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Tallenna muutokset",
+    "scheduleMode": "Latauksen ajoitus",
+    "scheduleModeCron": "Cron-lauseke",
+    "scheduleModeDescription": "Lataa säännöllisin väliajoin tai Cron-lausekkeella.",
+    "scheduleModeInterval": "Säännöllinen väliaika",
    "selectAccountType": "Valitse tilityyppi",
    "selectAtLeastOneFolder": "Valitse vähintään yksi kansio",
    "selectAuthMethod": "Valitse todennusmenetelmä",
@@ -556,6 +579,7 @@
    "account": "Tili",
    "attachments": "Liitteet",
    "bcc": "Piilokopio",
+    "blockRemoteAgain": "Estä uudelleen",
    "cc": "Kopio",
    "clickToDownload": "Napsauta ladataksesi",
    "date": "Päivämäärä",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Ei valittua viestiä",
    "noTagsYet": "Ei tunnisteita vielä",
    "onlyNonInlineAttachments": "Vain muut kuin sisäiset liitteet näytetään tässä.",
+    "remoteBlocked": "Tietoturvasi vuoksi Bichon on estänyt etäsisällön tässä viestissä.",
+    "remoteShown": "Etäsisältö näytetään nyt.",
    "showLess": "näytä vähemmän",
    "showMore": "näytä lisää...",
+    "showRemoteContent": "Näytä etäsisältö",
    "subject": "Aihe",
    "tags": "Tunnisteet",
    "to": "Vastaanottaja",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "Sähköposti on pakollinen",
-    "folderLimitMustBeAtLeast100": "Kansiorajan on oltava vähintään 100",
-    "folderLimitMustBeNumber": "Kansiorajan on oltava numero",
    "imapHostCannotBeEmpty": "IMAP-isäntä ei voi olla tyhjä",
    "imapHostRequired": "IMAP-isäntä on pakollinen",
    "imapPortMustBeLessThan65536": "IMAP-portin on oltava pienempi kuin 65536",
    "imapPortMustBePositive": "IMAP-portin on oltava positiivinen kokonaisluku",
    "incrementalSyncMustBeAtLeast10": "Lisäävän synkronoinnin välin on oltava vähintään 10 minuuttia",
    "incrementalSyncMustBeNumber": "Lisäävän synkronoinnin välin on oltava numero",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Virheellinen sähköpostiosoite",
    "invalidUrl": "Virheellinen URL-osoite",
    "passwordMinLength": "Salasanan on oltava vähintään {{min}} merkkiä pitkä",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "Eräkoko tulee olla enintään 200",
    "singleRequestBatchSizeTooSmall": "Eräkoko tulee olla vähintään 10"
  }
-}
+}
--- a/web/src/locales/fr.json
+++ b/web/src/locales/fr.json
@@ -100,6 +100,7 @@
    "auth": "Auth.",
    "authType": "type_auth",
    "autoConfiguring": "Configuration automatique...",
+    "autoDownloadNewMailboxes": "Ajouter automatiquement les nouveaux dossiers",
    "autoDownloadNewMailboxesDescription": "Ajouter automatiquement les nouveaux dossiers à la liste de téléchargement.",
    "beforeRelative": "Télécharger uniquement les anciens e-mails",
    "beforeRelativeValue": "Télécharger les e-mails d'il y a {{value}} {{unit}}",
@@ -114,6 +115,24 @@
    "continue": "Continuer",
    "createdAt": "Créé le",
    "creationFailed": "La création a échoué, veuillez réessayer plus tard",
+    "cronAdvanced": "Expression avancée",
+    "cronDaily": "Chaque jour",
+    "cronDayOfMonth": "Jour de la semaine",
+    "cronDayOfWeek": "Jour de la semaine",
+    "cronFrequency": "Fréquence",
+    "cronFriday": "Vendredi",
+    "cronHour": "Heure",
+    "cronMinute": "Minute",
+    "cronMonday": "Lundi",
+    "cronMonthly": "Chaque mois",
+    "cronSaturday": "Samedi",
+    "cronSimple": "Expression simple",
+    "cronSunday": "Dimanche",
+    "cronThursday": "Jeudi",
+    "cronTimezoneNote": "Heures au fuseau horaire du serveur.",
+    "cronTuesday": "Mardi",
+    "cronWednesday": "Mercredi",
+    "cronWeekly": "Chaque semaine",
    "dateSelection": "Sélection de Date",
    "dateSince": "Date Depuis",
    "days": "Jours",
@@ -132,6 +151,9 @@
    "downloadFailed": "Échec du lancement de la tâche de téléchargement",
    "downloadInterval": "Intervalle de téléchargement (minutes)",
    "downloadIntervalPlaceholder": "Entrer les minutes",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "Cron à 6 champs (sec min heure jour mois jour-sem) à l'heure du serveur. Remplace l'intervalle.",
+    "downloadSchedulePlaceholder": "ex. 0 0 * * *",
    "downloadScope": "Stratégie de téléchargement",
    "downloadScopeDescription": "Choisissez les e-mails à indexer et à télécharger.",
    "downloadStarted": "Tâche de téléchargement lancée",
@@ -155,9 +177,6 @@
    "everyMinutes": "toutes les {{minutes}} minutes",
    "field": "Champ",
    "fixed": "Fixe",
-    "folderLimit": "Limite de Dossiers",
-    "folderLimitDescription": "Limite le nombre d'e-mails à synchroniser par dossier (minimum 100). Laissez vide pour aucune limite.",
-    "folderLimitPlaceholder": "ex. 1000",
    "folderSync": {
      "autoSelectDescendants": "Sélectionner automatiquement les descendants",
      "autoSelectParents": "Sélectionner automatiquement les parents",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Enregistrer les Modifications",
+    "scheduleMode": "Planification de téléchargement",
+    "scheduleModeCron": "Expression Cron",
+    "scheduleModeDescription": "Téléchargement par intervalle fixe ou expression Cron.",
+    "scheduleModeInterval": "Intervalle fixe",
    "selectAccountType": "Sélectionner le type de compte",
    "selectAtLeastOneFolder": "Veuillez sélectionner au moins un dossier",
    "selectAuthMethod": "Sélectionner une méthode d'authentification",
@@ -556,6 +579,7 @@
    "account": "Compte",
    "attachments": "Pièces jointes",
    "bcc": "Cci",
+    "blockRemoteAgain": "Bloquer à nouveau",
    "cc": "Cc",
    "clickToDownload": "Cliquer pour télécharger",
    "date": "Date",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Aucun message sélectionné",
    "noTagsYet": "Aucune étiquette pour l'instant",
    "onlyNonInlineAttachments": "Seules les pièces jointes non intégrées sont affichées ici.",
+    "remoteBlocked": "Pour protéger votre vie privée, Bichon a bloqué le contenu distant dans ce message.",
+    "remoteShown": "Contenu distant affiché.",
    "showLess": "afficher moins",
    "showMore": "afficher plus...",
+    "showRemoteContent": "Afficher le contenu distant",
    "subject": "Objet",
    "tags": "Étiquettes",
    "to": "À",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "L'adresse e-mail est obligatoire",
-    "folderLimitMustBeAtLeast100": "La limite de dossiers doit être d'au moins 100",
-    "folderLimitMustBeNumber": "La limite de dossiers doit être un nombre",
    "imapHostCannotBeEmpty": "L'hôte IMAP ne peut pas être vide",
    "imapHostRequired": "L'hôte IMAP est obligatoire",
    "imapPortMustBeLessThan65536": "Le port IMAP doit être inférieur à 65536",
    "imapPortMustBePositive": "Le port IMAP doit être un entier positif",
    "incrementalSyncMustBeAtLeast10": "L'intervalle de synchronisation incrémentielle doit être d'au moins 10 minutes",
    "incrementalSyncMustBeNumber": "L'intervalle de synchronisation incrémentielle doit être un nombre",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Adresse e-mail non valide",
    "invalidUrl": "URL non valide",
    "passwordMinLength": "Le mot de passe doit contenir au moins {{min}} caractères",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "La taille du lot doit être au plus 200",
    "singleRequestBatchSizeTooSmall": "La taille du lot doit être au moins 10"
  }
-}
+}
--- a/web/src/locales/it.json
+++ b/web/src/locales/it.json
@@ -100,6 +100,7 @@
    "auth": "Autenticazione",
    "authType": "tipo_autenticazione",
    "autoConfiguring": "Configurazione automatica...",
+    "autoDownloadNewMailboxes": "Aggiungi automaticamente nuove cartelle",
    "autoDownloadNewMailboxesDescription": "Aggiungi automaticamente le nuove cartelle all'elenco di download.",
    "beforeRelative": "Scarica solo le vecchie email",
    "beforeRelativeValue": "Scarica email da {{value}} {{unit}} fa",
@@ -114,6 +115,24 @@
    "continue": "Continua",
    "createdAt": "Creato Il",
    "creationFailed": "Creazione fallita, riprova più tardi",
+    "cronAdvanced": "Espressione avanzata",
+    "cronDaily": "Ogni giorno",
+    "cronDayOfMonth": "Giorno della settimana",
+    "cronDayOfWeek": "Giorno della settimana",
+    "cronFrequency": "Frequenza",
+    "cronFriday": "Venerdì",
+    "cronHour": "Ora",
+    "cronMinute": "Minuto",
+    "cronMonday": "Lunedì",
+    "cronMonthly": "Ogni mese",
+    "cronSaturday": "Sabato",
+    "cronSimple": "Espressione semplice",
+    "cronSunday": "Domenica",
+    "cronThursday": "Giovedì",
+    "cronTimezoneNote": "Orari nel fuso orario del server.",
+    "cronTuesday": "Martedì",
+    "cronWednesday": "Mercoledì",
+    "cronWeekly": "Ogni settimana",
    "dateSelection": "Selezione Data",
    "dateSince": "Data Da",
    "days": "Giorni",
@@ -132,6 +151,9 @@
    "downloadFailed": "Avvio attività di download non riuscito",
    "downloadInterval": "Intervallo di download (minuti)",
    "downloadIntervalPlaceholder": "Inserisci i minuti",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "Cron a 6 campi (sec min ora giorno mese giorno-sett) in ora del server. Sostituisce l'intervallo.",
+    "downloadSchedulePlaceholder": "es. 0 0 * * *",
    "downloadScope": "Strategia di download",
    "downloadScopeDescription": "Scegli quali email indicizzare e scaricare.",
    "downloadStarted": "Attività di download avviata",
@@ -155,9 +177,6 @@
    "everyMinutes": "ogni {{minutes}} minuti",
    "field": "Campo",
    "fixed": "Fissa",
-    "folderLimit": "Limite Cartelle",
-    "folderLimitDescription": "Limita il numero di email da sincronizzare per cartella (minimo 100). Lascia vuoto per nessun limite.",
-    "folderLimitPlaceholder": "es. 1000",
    "folderSync": {
      "autoSelectDescendants": "Seleziona automaticamente i discendenti",
      "autoSelectParents": "Seleziona automaticamente i genitori",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Salva Modifiche",
+    "scheduleMode": "Pianificazione del download",
+    "scheduleModeCron": "Espressione Cron",
+    "scheduleModeDescription": "Download a intervalli fissi o tramite espressioni Cron.",
+    "scheduleModeInterval": "Intervallo fisso",
    "selectAccountType": "Seleziona tipo di account",
    "selectAtLeastOneFolder": "Seleziona almeno una cartella",
    "selectAuthMethod": "Seleziona un metodo di autenticazione",
@@ -556,6 +579,7 @@
    "account": "Account",
    "attachments": "Allegati",
    "bcc": "BCC",
+    "blockRemoteAgain": "Blocca di nuovo",
    "cc": "CC",
    "clickToDownload": "Clicca per scaricare",
    "date": "Data",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Nessun messaggio selezionato",
    "noTagsYet": "Ancora nessun tag",
    "onlyNonInlineAttachments": "Solo gli allegati non in linea sono mostrati qui.",
+    "remoteBlocked": "Per proteggere la tua privacy, Bichon ha bloccato i contenuti remoti in questo messaggio.",
+    "remoteShown": "Contenuto remoto mostrato.",
    "showLess": "mostra meno",
    "showMore": "mostra altro...",
+    "showRemoteContent": "Mostra contenuto remoto",
    "subject": "Oggetto",
    "tags": "Tag",
    "to": "A",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "L'email è obbligatoria",
-    "folderLimitMustBeAtLeast100": "Il limite di cartelle deve essere almeno 100",
-    "folderLimitMustBeNumber": "Il limite di cartelle deve essere un numero",
    "imapHostCannotBeEmpty": "L'host IMAP non può essere vuoto",
    "imapHostRequired": "L'host IMAP è obbligatorio",
    "imapPortMustBeLessThan65536": "La porta IMAP deve essere inferiore a 65536",
    "imapPortMustBePositive": "La porta IMAP deve essere un numero intero positivo",
    "incrementalSyncMustBeAtLeast10": "L'intervallo di sincronizzazione incrementale deve essere di almeno 10 minuti",
    "incrementalSyncMustBeNumber": "L'intervallo di sincronizzazione incrementale deve essere un numero",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Indirizzo email non valido",
    "invalidUrl": "URL non valido",
    "passwordMinLength": "La password deve contenere almeno {{min}} caratteri",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "La dimensione del batch deve essere al massimo 200",
    "singleRequestBatchSizeTooSmall": "La dimensione del batch deve essere almeno 10"
  }
-}
+}
--- a/web/src/locales/jp.json
+++ b/web/src/locales/jp.json
@@ -100,6 +100,7 @@
    "auth": "認証",
    "authType": "認証タイプ",
    "autoConfiguring": "自動設定中...",
+    "autoDownloadNewMailboxes": "新着フォルダーの自動追加",
    "autoDownloadNewMailboxesDescription": "新しく見つかったフォルダーを自動的にダウンロード一覧に追加します。",
    "beforeRelative": "古いメールのみダウンロード",
    "beforeRelativeValue": "{{value}} {{unit}}前より古いメールをダウンロード",
@@ -114,6 +115,24 @@
    "continue": "続行",
    "createdAt": "作成日時",
    "creationFailed": "作成に失敗しました。しばらくしてからもう一度お試しください。",
+    "cronAdvanced": "高度な式",
+    "cronDaily": "毎日",
+    "cronDayOfMonth": "曜日",
+    "cronDayOfWeek": "曜日",
+    "cronFrequency": "頻度",
+    "cronFriday": "金曜日",
+    "cronHour": "时",
+    "cronMinute": "分",
+    "cronMonday": "月曜日",
+    "cronMonthly": "毎月",
+    "cronSaturday": "土曜日",
+    "cronSimple": "簡易式",
+    "cronSunday": "日曜日",
+    "cronThursday": "木曜日",
+    "cronTimezoneNote": "時間はサーバーの現地時間です。",
+    "cronTuesday": "火曜日",
+    "cronWednesday": "水曜日",
+    "cronWeekly": "毎週",
    "dateSelection": "日付選択",
    "dateSince": "同期開始日",
    "days": "日",
@@ -132,6 +151,9 @@
    "downloadFailed": "ダウンロードタスクの起動に失敗しました",
    "downloadInterval": "ダウンロード間隔 (分)",
    "downloadIntervalPlaceholder": "分を入力してください",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "サーバー時間の6フィールドCron式（秒分時日月曜日）。設定値より優先。",
+    "downloadSchedulePlaceholder": "例：0 0 * * *",
    "downloadScope": "ダウンロード戦略",
    "downloadScopeDescription": "インデックスとダウンロードの対象となるメールを選択してください。",
    "downloadStarted": "ダウンロードタスクを開始しました",
@@ -155,9 +177,6 @@
    "everyMinutes": "{{minutes}}分ごと",
    "field": "フィールド",
    "fixed": "固定",
-    "folderLimit": "フォルダーの制限",
-    "folderLimitDescription": "フォルダーごとに同期するメールの数を制限します（最小100）。制限なしにする場合は空欄にしてください。",
-    "folderLimitPlaceholder": "例: 1000",
    "folderSync": {
      "autoSelectDescendants": "子項目を自動選択",
      "autoSelectParents": "親項目を自動選択",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "変更を保存",
+    "scheduleMode": "ダウンロードスケジュール",
+    "scheduleModeCron": "Cron式",
+    "scheduleModeDescription": "固定間隔またはCron式でダウンロード。",
+    "scheduleModeInterval": "固定間隔",
    "selectAccountType": "アカウントの種類を選択",
    "selectAtLeastOneFolder": "少なくとも1つのフォルダーを選択してください",
    "selectAuthMethod": "認証方式を選択",
@@ -556,6 +579,7 @@
    "account": "アカウント",
    "attachments": "添付ファイル",
    "bcc": "BCC",
+    "blockRemoteAgain": "再度ブロック",
    "cc": "CC",
    "clickToDownload": "クリックしてダウンロード",
    "date": "日付",
@@ -575,8 +599,11 @@
    "noMessageSelected": "メッセージが選択されていません",
    "noTagsYet": "まだタグがありません",
    "onlyNonInlineAttachments": "インラインではない添付ファイルのみここに表示されます。",
+    "remoteBlocked": "プライバシー保護のため、Bichonはこのメッセージ内のリモートコンテンツをブロックしました。",
+    "remoteShown": "リモートコンテンツを表示しています。",
    "showLess": "少なく表示",
    "showMore": "さらに表示...",
+    "showRemoteContent": "リモートコンテンツを表示",
    "subject": "件名",
    "tags": "タグ",
    "to": "宛先",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "メールアドレスは必須です",
-    "folderLimitMustBeAtLeast100": "フォルダーの制限は100以上である必要があります",
-    "folderLimitMustBeNumber": "フォルダーの制限は数値である必要があります",
    "imapHostCannotBeEmpty": "IMAPホストは空にできません",
    "imapHostRequired": "IMAPホストは必須です",
    "imapPortMustBeLessThan65536": "IMAPポートは65536未満である必要があります",
    "imapPortMustBePositive": "IMAPポートは正の整数である必要があります",
    "incrementalSyncMustBeAtLeast10": "増分同期間隔は10分以上である必要があります",
    "incrementalSyncMustBeNumber": "増分同期間隔は数値である必要があります",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "無効なメールアドレスです",
    "invalidUrl": "無効なURLです",
    "passwordMinLength": "パスワードは{{min}}文字以上である必要があります",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "バッチサイズは最大でも200でなければなりません",
    "singleRequestBatchSizeTooSmall": "バッチサイズは最低でも10でなければなりません"
  }
-}
+}
--- a/web/src/locales/ko.json
+++ b/web/src/locales/ko.json
@@ -100,6 +100,7 @@
    "auth": "인증",
    "authType": "인증 유형",
    "autoConfiguring": "자동 구성 중...",
+    "autoDownloadNewMailboxes": "새 폴더 자동 추가",
    "autoDownloadNewMailboxesDescription": "새로 발견된 폴더를 다운로드 목록에 자동으로 추가합니다.",
    "beforeRelative": "이전 이메일만 다운로드",
    "beforeRelativeValue": "{{value}} {{unit}} 전의 이메일 다운로드",
@@ -114,6 +115,24 @@
    "continue": "계속",
    "createdAt": "생성일",
    "creationFailed": "생성에 실패했습니다. 나중에 다시 시도하십시오.",
+    "cronAdvanced": "고급 표현식",
+    "cronDaily": "매일",
+    "cronDayOfMonth": "요일",
+    "cronDayOfWeek": "요일",
+    "cronFrequency": "주기",
+    "cronFriday": "금요일",
+    "cronHour": "시",
+    "cronMinute": "분",
+    "cronMonday": "월요일",
+    "cronMonthly": "매월",
+    "cronSaturday": "토요일",
+    "cronSimple": "간단한 표현식",
+    "cronSunday": "일요일",
+    "cronThursday": "목요일",
+    "cronTimezoneNote": "모든 시간은 서버 현지 시간 기준입니다.",
+    "cronTuesday": "화요일",
+    "cronWednesday": "수요일",
+    "cronWeekly": "매주",
    "dateSelection": "날짜 선택",
    "dateSince": "동기화 시작일",
    "days": "일",
@@ -132,6 +151,9 @@
    "downloadFailed": "다운로드 작업 시작 실패",
    "downloadInterval": "다운로드 주기 (분)",
    "downloadIntervalPlaceholder": "분 단위 입력",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "서버 시간 기준 6필드 Cron(초 분 시 일 월 요일). 간격 설정보다 우선됨.",
+    "downloadSchedulePlaceholder": "예: 0 0 * * *",
    "downloadScope": "다운로드 전략",
    "downloadScopeDescription": "색인화 및 다운로드할 이메일을 선택하십시오.",
    "downloadStarted": "다운로드 작업 시작됨",
@@ -155,9 +177,6 @@
    "everyMinutes": "매 {{minutes}}분",
    "field": "필드",
    "fixed": "고정",
-    "folderLimit": "폴더 제한",
-    "folderLimitDescription": "폴더당 동기화할 이메일 수를 제한합니다(최소 100). 제한이 없으면 비워 두십시오.",
-    "folderLimitPlaceholder": "예: 1000",
    "folderSync": {
      "autoSelectDescendants": "하위 항목 자동 선택",
      "autoSelectParents": "상위 항목 자동 선택",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "변경 사항 저장",
+    "scheduleMode": "다운로드 일정",
+    "scheduleModeCron": "Cron 표현식",
+    "scheduleModeDescription": "고정 간격 또는 Cron 표현식으로 다운로드.",
+    "scheduleModeInterval": "고정 간격",
    "selectAccountType": "계정 유형 선택",
    "selectAtLeastOneFolder": "하나 이상의 폴더를 선택하십시오",
    "selectAuthMethod": "인증 방법 선택",
@@ -556,6 +579,7 @@
    "account": "계정",
    "attachments": "첨부 파일",
    "bcc": "숨은 참조",
+    "blockRemoteAgain": "다시 차단",
    "cc": "참조",
    "clickToDownload": "클릭하여 다운로드",
    "date": "날짜",
@@ -575,8 +599,11 @@
    "noMessageSelected": "선택된 메시지 없음",
    "noTagsYet": "아직 태그가 없습니다",
    "onlyNonInlineAttachments": "인라인이 아닌 첨부 파일만 여기에 표시됩니다.",
+    "remoteBlocked": "개인 정보 보호를 위해 Bichon이 이 메시지의 원격 콘텐츠를 차단했습니다.",
+    "remoteShown": "원격 콘텐츠가 표시됩니다.",
    "showLess": "간단히 보기",
    "showMore": "더 보기...",
+    "showRemoteContent": "원격 콘텐츠 표시",
    "subject": "제목",
    "tags": "태그",
    "to": "받는 사람",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "이메일 주소는 필수입니다",
-    "folderLimitMustBeAtLeast100": "폴더 제한은 최소 100 이상이어야 합니다",
-    "folderLimitMustBeNumber": "폴더 제한은 숫자여야 합니다",
    "imapHostCannotBeEmpty": "IMAP 호스트는 비워 둘 수 없습니다",
    "imapHostRequired": "IMAP 호스트는 필수입니다",
    "imapPortMustBeLessThan65536": "IMAP 포트는 65536보다 작아야 합니다",
    "imapPortMustBePositive": "IMAP 포트는 양의 정수여야 합니다",
    "incrementalSyncMustBeAtLeast10": "증분 동기화 간격은 최소 10분 이상이어야 합니다",
    "incrementalSyncMustBeNumber": "증분 동기화 간격은 숫자여야 합니다",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "유효하지 않은 이메일 주소",
    "invalidUrl": "유효하지 않은 URL",
    "passwordMinLength": "비밀번호는 {{min}}자 이상이어야 합니다",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "배치 크기는 최대 200이어야 합니다",
    "singleRequestBatchSizeTooSmall": "배치 크기는 최소 10이어야 합니다"
  }
-}
+}
--- a/web/src/locales/nl.json
+++ b/web/src/locales/nl.json
@@ -100,6 +100,7 @@
    "auth": "Authenticatie",
    "authType": "authenticatie_type",
    "autoConfiguring": "Automatisch configureren...",
+    "autoDownloadNewMailboxes": "Nieuwe mappen automatisch importeren",
    "autoDownloadNewMailboxesDescription": "Voeg automatisch nieuw ontdekte mappen toe aan de downloadlijst.",
    "beforeRelative": "Download alleen oude e-mails",
    "beforeRelativeValue": "Download e-mails van {{value}} {{unit}} geleden",
@@ -114,6 +115,24 @@
    "continue": "Doorgaan",
    "createdAt": "Aangemaakt Op",
    "creationFailed": "Aanmaken mislukt, probeer het later opnieuw",
+    "cronAdvanced": "Geavanceerde expressie",
+    "cronDaily": "Dagelijks",
+    "cronDayOfMonth": "Dag van de week",
+    "cronDayOfWeek": "Dag van de week",
+    "cronFrequency": "Frequentie",
+    "cronFriday": "Vrijdag",
+    "cronHour": "Uur",
+    "cronMinute": "Minuut",
+    "cronMonday": "Maandag",
+    "cronMonthly": "Maandelijks",
+    "cronSaturday": "Zaterdag",
+    "cronSimple": "Simpele expressie",
+    "cronSunday": "Zondag",
+    "cronThursday": "Donderdag",
+    "cronTimezoneNote": "Alle tijden zijn server-lokale tijd.",
+    "cronTuesday": "Dinsdag",
+    "cronWednesday": "Woensdag",
+    "cronWeekly": "Wekelijks",
    "dateSelection": "Datumselectie",
    "dateSince": "Datum Sinds",
    "days": "Dagen",
@@ -132,6 +151,9 @@
    "downloadFailed": "Downloadtaak starten mislukt",
    "downloadInterval": "Download-interval (minuten)",
    "downloadIntervalPlaceholder": "Voer minuten in",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "6-velds Cron (sec min uur dag maand dag-week) in servertijd. Overschrijft interval.",
+    "downloadSchedulePlaceholder": "bijv. 0 0 * * *",
    "downloadScope": "Downloadstrategie",
    "downloadScopeDescription": "Kies welke e-mails moeten worden geïndexeerd en gedownload.",
    "downloadStarted": "Downloadtaak gestart",
@@ -155,9 +177,6 @@
    "everyMinutes": "elke {{minutes}} minuten",
    "field": "Veld",
    "fixed": "Vast",
-    "folderLimit": "Mappenlimiet",
-    "folderLimitDescription": "Beperk het aantal te synchroniseren e-mails per map (minimaal 100). Laat leeg voor geen limiet.",
-    "folderLimitPlaceholder": "bv. 1000",
    "folderSync": {
      "autoSelectDescendants": "Automatisch onderliggende items selecteren",
      "autoSelectParents": "Automatisch bovenliggende items selecteren",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Wijzigingen opslaan",
+    "scheduleMode": "Downloadschema",
+    "scheduleModeCron": "Cron-expressie",
+    "scheduleModeDescription": "Downloaden via vaste intervallen o f Cron-expressies.",
+    "scheduleModeInterval": "Vast interval",
    "selectAccountType": "Selecteer accounttype",
    "selectAtLeastOneFolder": "Selecteer alstublieft ten minste één map",
    "selectAuthMethod": "Selecteer een authenticatiemethode",
@@ -556,6 +579,7 @@
    "account": "Account",
    "attachments": "Bijlagen",
    "bcc": "BCC",
+    "blockRemoteAgain": "Opnieuw blokkeren",
    "cc": "CC",
    "clickToDownload": "Klik om te downloaden",
    "date": "Datum",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Geen bericht geselecteerd",
    "noTagsYet": "Nog geen tags",
    "onlyNonInlineAttachments": "Alleen niet-inline bijlagen worden hier getoond.",
+    "remoteBlocked": "Om uw privacy te beschermen, heeft Bichon externe inhoud in dit bericht geblokkeerd.",
+    "remoteShown": "Externe inhoud wordt nu weergegeven.",
    "showLess": "toon minder",
    "showMore": "toon meer...",
+    "showRemoteContent": "Externe inhoud weergeven",
    "subject": "Onderwerp",
    "tags": "Tags",
    "to": "Aan",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "E-mail is vereist",
-    "folderLimitMustBeAtLeast100": "Mappenlimiet moet ten minste 100 zijn",
-    "folderLimitMustBeNumber": "Mappenlimiet moet een nummer zijn",
    "imapHostCannotBeEmpty": "IMAP host mag niet leeg zijn",
    "imapHostRequired": "IMAP host is vereist",
    "imapPortMustBeLessThan65536": "IMAP poort moet kleiner zijn dan 65536",
    "imapPortMustBePositive": "IMAP poort moet een positief geheel getal zijn",
    "incrementalSyncMustBeAtLeast10": "Incrementaal sync interval moet ten minste 10 minuten zijn",
    "incrementalSyncMustBeNumber": "Incrementaal sync interval moet een nummer zijn",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Ongeldig e-mailadres",
    "invalidUrl": "Ongeldige URL",
    "passwordMinLength": "Wachtwoord moet ten minste {{min}} tekens lang zijn",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "Batch‑grootte moet hoogstens 200 zijn",
    "singleRequestBatchSizeTooSmall": "Batch‑grootte moet ten minste 10 zijn"
  }
-}
+}
--- a/web/src/locales/no.json
+++ b/web/src/locales/no.json
@@ -100,6 +100,7 @@
    "auth": "Autentisering",
    "authType": "autentiseringstype",
    "autoConfiguring": "Konfigurerer automatisk...",
+    "autoDownloadNewMailboxes": "Legg til nye mapper automatisk",
    "autoDownloadNewMailboxesDescription": "Legg automatisk til nye mapper i nedlastingslisten.",
    "beforeRelative": "Last ned kun gamle e-poster",
    "beforeRelativeValue": "Last ned e-poster fra {{value}} {{unit}} siden",
@@ -114,6 +115,24 @@
    "continue": "Fortsett",
    "createdAt": "Opprettet",
    "creationFailed": "Opprettelse mislyktes, prøv igjen senere",
+    "cronAdvanced": "Avansert uttrykk",
+    "cronDaily": "Daglig",
+    "cronDayOfMonth": "Ugedag",
+    "cronDayOfWeek": "Ugedag",
+    "cronFrequency": "Frekvens",
+    "cronFriday": "Fredag",
+    "cronHour": "Time",
+    "cronMinute": "Minutt",
+    "cronMonday": "Mandag",
+    "cronMonthly": "Månedlig",
+    "cronSaturday": "Lørdag",
+    "cronSimple": "Enkelt uttrykk",
+    "cronSunday": "Søndag",
+    "cronThursday": "Torsdag",
+    "cronTimezoneNote": "Alle klokkeslett er serverens lokaltid.",
+    "cronTuesday": "Tirsdag",
+    "cronWednesday": "Onsdag",
+    "cronWeekly": "Ukentlig",
    "dateSelection": "Datovalg",
    "dateSince": "Dato siden",
    "days": "Dager",
@@ -132,6 +151,9 @@
    "downloadFailed": "Kunne ikke starte nedlastingsoppgave",
    "downloadInterval": "Nedlastingsintervall (minutter)",
    "downloadIntervalPlaceholder": "Skriv inn minutter",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "6-felts Cron (sek min time dag mdr ukedag) i servertid. Overstyrer intervall.",
+    "downloadSchedulePlaceholder": "f.eks.: 0 0 * * *",
    "downloadScope": "Nedlastingsstrategi",
    "downloadScopeDescription": "Velg hvilke e-poster som skal indekseres og lastes ned.",
    "downloadStarted": "Nedlastingsoppgave startet",
@@ -155,9 +177,6 @@
    "everyMinutes": "hvert {{minutes}} minutt",
    "field": "Felt",
    "fixed": "Fast",
-    "folderLimit": "Mappegrense",
-    "folderLimitDescription": "Begrens antall e-poster som skal synkroniseres per mappe (minimum 100). La stå tomt for ingen grense.",
-    "folderLimitPlaceholder": "f.eks. 1000",
    "folderSync": {
      "autoSelectDescendants": "Velg etterkommere automatisk",
      "autoSelectParents": "Velg foreldre automatisk",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Lagre endringer",
+    "scheduleMode": "Nedlastingsplan",
+    "scheduleModeCron": "Cron-uttrykk",
+    "scheduleModeDescription": "Nedlasting med faste intervaller eller Cron-uttrykk.",
+    "scheduleModeInterval": "Fast intervall",
    "selectAccountType": "Velg kontotype",
    "selectAtLeastOneFolder": "Vennligst velg minst én mappe",
    "selectAuthMethod": "Velg en autentiseringsmetode",
@@ -556,6 +579,7 @@
    "account": "Konto",
    "attachments": "Vedlegg",
    "bcc": "Blindkopi",
+    "blockRemoteAgain": "Blokker igjen",
    "cc": "Kopi",
    "clickToDownload": "Klikk for å laste ned",
    "date": "Dato",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Ingen melding valgt",
    "noTagsYet": "Ingen etiketter ennå",
    "onlyNonInlineAttachments": "Kun ikke-innebygde vedlegg vises her.",
+    "remoteBlocked": "For å beskytte personvernet ditt har Bichon blokkert eksternt innhold i denne meldingen.",
+    "remoteShown": "Eksternt innhold vises nå.",
    "showLess": "vis mindre",
    "showMore": "vis mer...",
+    "showRemoteContent": "Vis eksternt indhold",
    "subject": "Emne",
    "tags": "Etiketter",
    "to": "Til",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "E-post er påkrevd",
-    "folderLimitMustBeAtLeast100": "Mappegrense må være minst 100",
-    "folderLimitMustBeNumber": "Mappegrense må være et tall",
    "imapHostCannotBeEmpty": "IMAP-vert kan ikke være tom",
    "imapHostRequired": "IMAP-vert er påkrevd",
    "imapPortMustBeLessThan65536": "IMAP-port må være mindre enn 65536",
    "imapPortMustBePositive": "IMAP-port må være et positivt heltall",
    "incrementalSyncMustBeAtLeast10": "Intervall for inkrementell synkronisering må være minst 10 minutter",
    "incrementalSyncMustBeNumber": "Intervall for inkrementell synkronisering må være et tall",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Ugyldig e-postadresse",
    "invalidUrl": "Ugyldig URL",
    "passwordMinLength": "Passordet må være minst {{min}} tegn langt",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "Batchstørrelse må være maksimalt 200",
    "singleRequestBatchSizeTooSmall": "Batchstørrelse må være minst 10"
  }
-}
+}
--- a/web/src/locales/pl.json
+++ b/web/src/locales/pl.json
@@ -100,6 +100,7 @@
    "auth": "Auth",
    "authType": "auth_type",
    "autoConfiguring": "Auto konfiguracja...",
+    "autoDownloadNewMailboxes": "Automatycznie dodawaj nowe foldery",
    "autoDownloadNewMailboxesDescription": "Automatycznie dodawaj nowo wykryte foldery do listy pobierania.",
    "beforeRelative": "Pobierz tylko stare e-maile",
    "beforeRelativeValue": "Pobierz e-maile sprzed {{value}} {{unit}}",
@@ -114,6 +115,24 @@
    "continue": "Kontynuj",
    "createdAt": "Utworzono",
    "creationFailed": "Bład tworzenia, spróbuj później",
+    "cronAdvanced": "Zaawansowane wyrażenie",
+    "cronDaily": "Codziennie",
+    "cronDayOfMonth": "Dzień tygodnia",
+    "cronDayOfWeek": "Dzień tygodnia",
+    "cronFrequency": "Częstotliwość",
+    "cronFriday": "Piątek",
+    "cronHour": "Godzina",
+    "cronMinute": "Minuta",
+    "cronMonday": "Poniedziałek",
+    "cronMonthly": "Co miesiąc",
+    "cronSaturday": "Sobota",
+    "cronSimple": "Proste wyrażenie",
+    "cronSunday": "Niedziela",
+    "cronThursday": "Czwartek",
+    "cronTimezoneNote": "Czas według lokalnej strefy serwera.",
+    "cronTuesday": "Wtorek",
+    "cronWednesday": "Środa",
+    "cronWeekly": "Co tydzień",
    "dateSelection": "Zaznaczenie daty",
    "dateSince": "Od kiedy",
    "days": "Dni",
@@ -132,6 +151,9 @@
    "downloadFailed": "Nie udało się uruchomić zadania pobierania",
    "downloadInterval": "Cykl pobierania (minuty)",
    "downloadIntervalPlaceholder": "Wprowadź minuty",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "6-polowy Cron (sek min godz dz msc dz-tyg) w czasie serwera. Nadpisuje interwał.",
+    "downloadSchedulePlaceholder": "np. 0 0 * * *",
    "downloadScope": "Strategia pobierania",
    "downloadScopeDescription": "Wybierz, które wiadomości e-mail mają być indeksowane i pobierane.",
    "downloadStarted": "Uruchomiono zadanie pobierania",
@@ -155,9 +177,6 @@
    "everyMinutes": "co {{minutes}} minut",
    "field": "Pole",
    "fixed": "Dokładnie",
-    "folderLimit": "Limit folderu",
-    "folderLimitDescription": "Ogranicz liczbę wiadomości email, które należy synchronizować w jednym folderze (minimum 100). Pozostaw puste, aby nie było limitu.",
-    "folderLimitPlaceholder": "np. 1000",
    "folderSync": {
      "autoSelectDescendants": "Automatyczny wybór dzieci (podrzędnych)",
      "autoSelectParents": "Automatyczny wybór rodziców (nadrzędnych)",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Zapisz zmiany",
+    "scheduleMode": "Harmonogram pobierania",
+    "scheduleModeCron": "Wyrażenie Cron",
+    "scheduleModeDescription": "Pobieranie w stałych odstępach lub przez wyrażenia Cron.",
+    "scheduleModeInterval": "Stały odstęp",
    "selectAccountType": "Wybierz typ konta",
    "selectAtLeastOneFolder": "Wybierz co najmniej jeden folder",
    "selectAuthMethod": "Zaznacz metodę uwierzytelniania IMAP",
@@ -556,6 +579,7 @@
    "account": "Konto",
    "attachments": "Załączniki",
    "bcc": "UDW",
+    "blockRemoteAgain": "Zablokuj ponownie",
    "cc": "DW",
    "clickToDownload": "Kliknij, aby pobrać",
    "date": "Data",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Nie zaznaczono wiadomości",
    "noTagsYet": "Nie ma tagów",
    "onlyNonInlineAttachments": "Wyświetlane są tylko załączniki non-inline.",
+    "remoteBlocked": "Aby chronić Twoją prywatność, Bichon zablokował zawartość zdalną w tej wiadomości.",
+    "remoteShown": "Zawartość zdalna jest teraz widoczna.",
    "showLess": "pokaż mniej",
    "showMore": "pokaż więcej...",
+    "showRemoteContent": "Pokaż zawartość zdalną",
    "subject": "Temat",
    "tags": "Tagi",
    "to": "Do",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "Email jest wymagany",
-    "folderLimitMustBeAtLeast100": "Limit folderów musi być liczbą nie mniejszą niż 100",
-    "folderLimitMustBeNumber": "Limit folderów musi być liczbą",
    "imapHostCannotBeEmpty": "Host IMAP nie może być pusty",
    "imapHostRequired": "Host IMAP jest wymagany",
    "imapPortMustBeLessThan65536": "Port IMAP musi być liczbą w przedziale 0-65535",
    "imapPortMustBePositive": "Port IMAP musi być liczbą całkowitą dodatnią",
    "incrementalSyncMustBeAtLeast10": "Przyrostowy interwał synchronizacji musi wynosić co najmniej 10 minut",
    "incrementalSyncMustBeNumber": "Przyrostowy interwał synchronizacji musi być liczbą",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Niewłaściwy adres email",
    "invalidUrl": "Niewłaściwy URL",
    "passwordMinLength": "Hasło musi posiadać conajmniej {{min}} znaków",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "Rozmiar partii może wynosić maksymalnie 200",
    "singleRequestBatchSizeTooSmall": "Rozmiar partii musi wynosić co najmniej 10"
  }
-}
+}
--- a/web/src/locales/pt.json
+++ b/web/src/locales/pt.json
@@ -100,6 +100,7 @@
    "auth": "Autenticação",
    "authType": "Tipo de Autenticação",
    "autoConfiguring": "Configurando Automaticamente...",
+    "autoDownloadNewMailboxes": "Adicionar automaticamente novas pastas",
    "autoDownloadNewMailboxesDescription": "Adicionar automaticamente novas pastas à lista de download.",
    "beforeRelative": "Baixar apenas e-mails antigos",
    "beforeRelativeValue": "Baixar e-mails de {{value}} {{unit}} atrás",
@@ -114,6 +115,24 @@
    "continue": "Continuar",
    "createdAt": "Criado Em",
    "creationFailed": "Falha na criação, por favor, tente novamente mais tarde.",
+    "cronAdvanced": "Expressão avançada",
+    "cronDaily": "Diariamente",
+    "cronDayOfMonth": "Dia da semana",
+    "cronDayOfWeek": "Dia da semana",
+    "cronFrequency": "Frequência",
+    "cronFriday": "Sexta-feira",
+    "cronHour": "Hora",
+    "cronMinute": "Minuto",
+    "cronMonday": "Segunda-feira",
+    "cronMonthly": "Mensalmente",
+    "cronSaturday": "Sábado",
+    "cronSimple": "Expressão simples",
+    "cronSunday": "Domingo",
+    "cronThursday": "Quinta-feira",
+    "cronTimezoneNote": "Horários no fuso horário do servidor.",
+    "cronTuesday": "Terça-feira",
+    "cronWednesday": "Quarta-feira",
+    "cronWeekly": "Semanalmente",
    "dateSelection": "Seleção de Data",
    "dateSince": "Data de Início da Sincronização",
    "days": "Dias",
@@ -132,6 +151,9 @@
    "downloadFailed": "Falha ao iniciar tarefa de download",
    "downloadInterval": "Intervalo de download (minutos)",
    "downloadIntervalPlaceholder": "Insira os minutos",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "Cron de 6 campos (seg min hora dia mês dia-sem) na hora do servidor. Substitui o intervalo.",
+    "downloadSchedulePlaceholder": "ex: 0 0 * * *",
    "downloadScope": "Estratégia de download",
    "downloadScopeDescription": "Escolha quais e-mails devem ser indexados e baixados.",
    "downloadStarted": "Tarefa de download iniciada",
@@ -155,9 +177,6 @@
    "everyMinutes": "A cada {{minutes}} minutos",
    "field": "Campo",
    "fixed": "Fixo",
-    "folderLimit": "Limite de Pasta",
-    "folderLimitDescription": "Limita o número de emails a sincronizar por pasta (mínimo 100). Deixe vazio para nenhum limite.",
-    "folderLimitPlaceholder": "Ex: 1000",
    "folderSync": {
      "autoSelectDescendants": "Selecionar automaticamente os descendentes",
      "autoSelectParents": "Selecionar automaticamente os pais",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Salvar Alterações",
+    "scheduleMode": "Agendamento de download",
+    "scheduleModeCron": "Expressão Cron",
+    "scheduleModeDescription": "Download por intervalos fixos ou expressões Cron.",
+    "scheduleModeInterval": "Intervalo fixo",
    "selectAccountType": "Selecionar tipo de conta",
    "selectAtLeastOneFolder": "Por favor, selecione pelo menos uma pasta",
    "selectAuthMethod": "Selecionar Método de Autenticação",
@@ -556,6 +579,7 @@
    "account": "Conta",
    "attachments": "Anexos",
    "bcc": "BCC",
+    "blockRemoteAgain": "Bloquear novamente",
    "cc": "CC",
    "clickToDownload": "Clique para baixar",
    "date": "Data",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Nenhuma mensagem selecionada",
    "noTagsYet": "Nenhuma tag ainda",
    "onlyNonInlineAttachments": "Apenas anexos não incorporados são exibidos aqui.",
+    "remoteBlocked": "Para proteger sua privacidade, o Bichon bloqueou o conteúdo remoto nesta mensagem.",
+    "remoteShown": "Conteúdo remoto exibido.",
    "showLess": "mostrar menos",
    "showMore": "mostrar mais...",
+    "showRemoteContent": "Mostrar conteúdo remoto",
    "subject": "Assunto",
    "tags": "Tags",
    "to": "Para",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "O endereço de email é obrigatório",
-    "folderLimitMustBeAtLeast100": "O Limite de Pasta deve ser pelo menos 100",
-    "folderLimitMustBeNumber": "O Limite de Pasta deve ser um número",
    "imapHostCannotBeEmpty": "O Host IMAP não pode estar vazio",
    "imapHostRequired": "O Host IMAP é obrigatório",
    "imapPortMustBeLessThan65536": "A Porta IMAP deve ser menor que 65536",
    "imapPortMustBePositive": "A Porta IMAP deve ser um número inteiro positivo",
    "incrementalSyncMustBeAtLeast10": "O Intervalo de Sincronização Incremental deve ser de pelo menos 10 minutos",
    "incrementalSyncMustBeNumber": "O Intervalo de Sincronização Incremental deve ser um número",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Endereço de email inválido",
    "invalidUrl": "URL inválido",
    "passwordMinLength": "A senha deve ter pelo menos {{min}} caracteres",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "O tamanho do lote deve ser no máximo 200",
    "singleRequestBatchSizeTooSmall": "O tamanho do lote deve ser pelo menos 10"
  }
-}
+}
--- a/web/src/locales/ru.json
+++ b/web/src/locales/ru.json
@@ -100,6 +100,7 @@
    "auth": "Авторизация",
    "authType": "тип_авторизации",
    "autoConfiguring": "Автонастройка...",
+    "autoDownloadNewMailboxes": "Автодобавление новых папок",
    "autoDownloadNewMailboxesDescription": "Автоматически добавлять новые папки в список загрузки.",
    "beforeRelative": "Скачать только старые письма",
    "beforeRelativeValue": "Скачать письма за {{value}} {{unit}} назад",
@@ -114,6 +115,24 @@
    "continue": "Продолжить",
    "createdAt": "Создано",
    "creationFailed": "Ошибка создания, попробуйте позже",
+    "cronAdvanced": "Расширенное выражение",
+    "cronDaily": "Ежедневно",
+    "cronDayOfMonth": "День недели",
+    "cronDayOfWeek": "День недели",
+    "cronFrequency": "Частота",
+    "cronFriday": "Пятница",
+    "cronHour": "Час",
+    "cronMinute": "Минута",
+    "cronMonday": "Понедельник",
+    "cronMonthly": "Ежемесячно",
+    "cronSaturday": "Суббота",
+    "cronSimple": "Простое выражение",
+    "cronSunday": "Воскресенье",
+    "cronThursday": "Четверг",
+    "cronTimezoneNote": "Время по местному часовому поясу сервера.",
+    "cronTuesday": "Вторник",
+    "cronWednesday": "Среда",
+    "cronWeekly": "Еженедельно",
    "dateSelection": "Выбор даты",
    "dateSince": "Дата с",
    "days": "Дни",
@@ -132,6 +151,9 @@
    "downloadFailed": "Не удалось запустить задачу загрузки",
    "downloadInterval": "Интервал загрузки (мин.)",
    "downloadIntervalPlaceholder": "Введите минуты",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "6-польный Cron (сек мин час день мес день-нед) по времени сервера. Меняет интервал.",
+    "downloadSchedulePlaceholder": "напр., 0 0 * * *",
    "downloadScope": "Стратегия загрузки",
    "downloadScopeDescription": "Выберите, какие электронные письма должны быть проиндексированы и скачаны.",
    "downloadStarted": "Задача загрузки запущена",
@@ -155,9 +177,6 @@
    "everyMinutes": "каждые {{minutes}} мин.",
    "field": "Поле",
    "fixed": "Фиксированная",
-    "folderLimit": "Лимит папки",
-    "folderLimitDescription": "Ограничить количество писем для синхронизации в папке (минимум 100). Оставьте пустым для снятия ограничений.",
-    "folderLimitPlaceholder": "например, 1000",
    "folderSync": {
      "autoSelectDescendants": "Автоматически выбирать дочерние элементы",
      "autoSelectParents": "Автоматически выбирать родительские элементы",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Сохранить изменения",
+    "scheduleMode": "Расписание загрузки",
+    "scheduleModeCron": "Выражение Cron",
+    "scheduleModeDescription": "Загрузка с фиксированным интервалом или по Cron.",
+    "scheduleModeInterval": "Фиксированный интервал",
    "selectAccountType": "Выберите тип аккаунта",
    "selectAtLeastOneFolder": "Пожалуйста, выберите хотя бы одну папку",
    "selectAuthMethod": "Выберите метод авторизации",
@@ -556,6 +579,7 @@
    "account": "Аккаунт",
    "attachments": "Вложения",
    "bcc": "Скрытая",
+    "blockRemoteAgain": "Заблокировать снова",
    "cc": "Копия",
    "clickToDownload": "Нажмите, чтобы скачать",
    "date": "Дата",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Сообщение не выбрано",
    "noTagsYet": "Тегов пока нет",
    "onlyNonInlineAttachments": "Здесь показаны только не встроенные вложения.",
+    "remoteBlocked": "Для защиты вашей конфиденциальности Bichon заблокировал удаленный контент в этом сообщении.",
+    "remoteShown": "Удаленный контент отображен.",
    "showLess": "свернуть",
    "showMore": "показать ещё...",
+    "showRemoteContent": "Показать удаленный контент",
    "subject": "Тема",
    "tags": "Теги",
    "to": "Кому",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "Email обязателен",
-    "folderLimitMustBeAtLeast100": "Лимит папки должен быть не менее 100",
-    "folderLimitMustBeNumber": "Лимит папки должен быть числом",
    "imapHostCannotBeEmpty": "IMAP хост не может быть пустым",
    "imapHostRequired": "IMAP хост обязателен",
    "imapPortMustBeLessThan65536": "IMAP порт должен быть меньше 65536",
    "imapPortMustBePositive": "IMAP порт должен быть положительным целым числом",
    "incrementalSyncMustBeAtLeast10": "Интервал инкрементальной синхронизации должен быть не менее 10 минут",
    "incrementalSyncMustBeNumber": "Интервал инкрементальной синхронизации должен быть числом",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Неверный адрес электронной почты",
    "invalidUrl": "Неверный URL",
    "passwordMinLength": "Пароль должен быть не менее {{min}} символов",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "Размер пакета должен быть не более 200",
    "singleRequestBatchSizeTooSmall": "Размер пакета должен быть не менее 10"
  }
-}
+}
--- a/web/src/locales/sv.json
+++ b/web/src/locales/sv.json
@@ -100,6 +100,7 @@
    "auth": "Auth",
    "authType": "auth_typ",
    "autoConfiguring": "Konfigurerar automatiskt...",
+    "autoDownloadNewMailboxes": "Lägg till nya mappar automatiskt",
    "autoDownloadNewMailboxesDescription": "Lägg automatiskt till nya mappar i hämtningslistan.",
    "beforeRelative": "Ladda ner endast gamla e-postmeddelanden",
    "beforeRelativeValue": "Ladda ner e-post från {{value}} {{unit}} sedan",
@@ -114,6 +115,24 @@
    "continue": "Fortsätt",
    "createdAt": "Skapad",
    "creationFailed": "Skapande misslyckades, försök igen senare",
+    "cronAdvanced": "Avancerat uttryck",
+    "cronDaily": "Dagligen",
+    "cronDayOfMonth": "Veckodag",
+    "cronDayOfWeek": "Veckodag",
+    "cronFrequency": "Frekvens",
+    "cronFriday": "Fredag",
+    "cronHour": "Timme",
+    "cronMinute": "Minut",
+    "cronMonday": "Måndag",
+    "cronMonthly": "Månadsvis",
+    "cronSaturday": "Lördag",
+    "cronSimple": "Enkelt uttryck",
+    "cronSunday": "Söndag",
+    "cronThursday": "Torsdag",
+    "cronTimezoneNote": "Alla tider visas i serverns lokaltid.",
+    "cronTuesday": "Tisdag",
+    "cronWednesday": "Onsdag",
+    "cronWeekly": "Veckovis",
    "dateSelection": "Datumsval",
    "dateSince": "Datum från",
    "days": "Dagar",
@@ -132,6 +151,9 @@
    "downloadFailed": "Misslyckades med att starta hämtningsuppgift",
    "downloadInterval": "Nedladdningsintervall (minuter)",
    "downloadIntervalPlaceholder": "Ange minuter",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "6-fälts Cron (sek min tim dag mån veckodag) i servertid. Ersätter intervall.",
+    "downloadSchedulePlaceholder": "t.ex. 0 0 * * *",
    "downloadScope": "Nedladdningsstrategi",
    "downloadScopeDescription": "Välj vilka e-postmeddelanden som ska indexeras och laddas ner.",
    "downloadStarted": "Hämtningsuppgift startad",
@@ -155,9 +177,6 @@
    "everyMinutes": "varje {{minutes}} minut",
    "field": "Fält",
    "fixed": "Fast",
-    "folderLimit": "Mappgräns",
-    "folderLimitDescription": "Begränsa antalet e-postmeddelanden att synkronisera per mapp (minst 100). Lämna tomt för ingen gräns.",
-    "folderLimitPlaceholder": "t.ex. 1000",
    "folderSync": {
      "autoSelectDescendants": "Välj underordnade automatiskt",
      "autoSelectParents": "Välj överordnade automatiskt",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "Spara ändringar",
+    "scheduleMode": "Hämtningsschema",
+    "scheduleModeCron": "Cron-uttryck",
+    "scheduleModeDescription": "Hämta med fasta intervall eller Cron-uttryck.",
+    "scheduleModeInterval": "Fast intervall",
    "selectAccountType": "Välj kontotyp",
    "selectAtLeastOneFolder": "Vänligen välj minst en mapp",
    "selectAuthMethod": "Välj en autentiseringsmetod",
@@ -556,6 +579,7 @@
    "account": "Konto",
    "attachments": "Bilagor",
    "bcc": "Hemlig kopia",
+    "blockRemoteAgain": "Blockera igen",
    "cc": "Kopia",
    "clickToDownload": "Klicka för att ladda ner",
    "date": "Datum",
@@ -575,8 +599,11 @@
    "noMessageSelected": "Inget meddelande valt",
    "noTagsYet": "Inga etiketter än",
    "onlyNonInlineAttachments": "Endast icke-inbäddade bilagor visas här.",
+    "remoteBlocked": "För att skydda din integritet har Bichon blockerat externt innehåll i detta meddelande.",
+    "remoteShown": "Externt innehåll visas nu.",
    "showLess": "visa mindre",
    "showMore": "visa mer...",
+    "showRemoteContent": "Visa externt innehåll",
    "subject": "Ämne",
    "tags": "Etiketter",
    "to": "Till",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "E-post krävs",
-    "folderLimitMustBeAtLeast100": "Mappgräns måste vara minst 100",
-    "folderLimitMustBeNumber": "Mappgräns måste vara ett tal",
    "imapHostCannotBeEmpty": "IMAP-värd kan inte vara tom",
    "imapHostRequired": "IMAP-värd krävs",
    "imapPortMustBeLessThan65536": "IMAP-port måste vara mindre än 65536",
    "imapPortMustBePositive": "IMAP-port måste vara ett positivt heltal",
    "incrementalSyncMustBeAtLeast10": "Intervall för inkrementell synkronisering måste vara minst 10 minuter",
    "incrementalSyncMustBeNumber": "Intervall för inkrementell synkronisering måste vara ett tal",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "Ogiltig e-postadress",
    "invalidUrl": "Ogiltig URL",
    "passwordMinLength": "Lösenordet måste vara minst {{min}} tecken långt",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "Batchstorlek måste vara högst 200",
    "singleRequestBatchSizeTooSmall": "Batchstorlek måste vara minst 10"
  }
-}
+}
--- a/web/src/locales/zh-tw.json
+++ b/web/src/locales/zh-tw.json
@@ -100,6 +100,7 @@
    "auth": "驗證",
    "authType": "驗證類型",
    "autoConfiguring": "正在自動設定...",
+    "autoDownloadNewMailboxes": "自動添加新郵件夾",
    "autoDownloadNewMailboxesDescription": "自動將新發現的郵件夾添加到下載列表中。",
    "beforeRelative": "僅下載舊郵件",
    "beforeRelativeValue": "下載 {{value}} {{unit}} 之前的郵件",
@@ -114,6 +115,24 @@
    "continue": "繼續",
    "createdAt": "建立時間",
    "creationFailed": "建立失敗，請稍後再試。",
+    "cronAdvanced": "高級表達式",
+    "cronDaily": "每天",
+    "cronDayOfMonth": "星期",
+    "cronDayOfWeek": "星期",
+    "cronFrequency": "頻率",
+    "cronFriday": "星期五",
+    "cronHour": "小時",
+    "cronMinute": "分鐘",
+    "cronMonday": "星期一",
+    "cronMonthly": "每月",
+    "cronSaturday": "星期六",
+    "cronSimple": "简易表達式",
+    "cronSunday": "星期日",
+    "cronThursday": "星期四",
+    "cronTimezoneNote": "所有時間均使用伺服器在地時區。",
+    "cronTuesday": "星期二",
+    "cronWednesday": "星期三",
+    "cronWeekly": "每周",
    "dateSelection": "日期選擇",
    "dateSince": "同步起始日期",
    "days": "天",
@@ -132,6 +151,9 @@
    "downloadFailed": "啟動下載任務失敗",
    "downloadInterval": "下載週期 (分鐘)",
    "downloadIntervalPlaceholder": "請輸入分鐘數",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "伺服器時間的 6 位 Cron 表達式（秒分時日月週），提供時覆蓋間隔設定。",
+    "downloadSchedulePlaceholder": "例如：0 0 * * *",
    "downloadScope": "下載策略",
    "downloadScopeDescription": "選擇哪些郵件應被索引和下載。",
    "downloadStarted": "下載任務已啟動",
@@ -155,9 +177,6 @@
    "everyMinutes": "每 {{minutes}} 分鐘",
    "field": "欄位",
    "fixed": "固定",
-    "folderLimit": "資料夾限制",
-    "folderLimitDescription": "限制每個資料夾要同步的郵件數量（最小 100）。若無限制請留空。",
-    "folderLimitPlaceholder": "例如：1000",
    "folderSync": {
      "autoSelectDescendants": "自動選取子項",
      "autoSelectParents": "自動選取父項",
@@ -246,6 +265,10 @@
      }
    },
    "saveChanges": "儲存變更",
+    "scheduleMode": "下載排程",
+    "scheduleModeCron": "Cron 表達式",
+    "scheduleModeDescription": "設定固定間隔或 Cron 表達式下載郵件。",
+    "scheduleModeInterval": "固定間隔",
    "selectAccountType": "選擇郵件帳戶類型",
    "selectAtLeastOneFolder": "請至少選擇一個資料夾",
    "selectAuthMethod": "選擇驗證方法",
@@ -556,6 +579,7 @@
    "account": "帳號",
    "attachments": "附件",
    "bcc": "密件副本 (BCC)",
+    "blockRemoteAgain": "重新阻止",
    "cc": "副本 (CC)",
    "clickToDownload": "點擊下載",
    "date": "日期",
@@ -575,8 +599,11 @@
    "noMessageSelected": "未選取任何訊息",
    "noTagsYet": "尚無標籤",
    "onlyNonInlineAttachments": "此處僅顯示非內嵌附件。",
+    "remoteBlocked": "為了保護您的隱私，Bichon 已阻止此郵件中的遠端內容。",
+    "remoteShown": "已顯示遠端內容。",
    "showLess": "顯示較少",
    "showMore": "顯示更多...",
+    "showRemoteContent": "顯示遠端內容",
    "subject": "主旨",
    "tags": "標籤",
    "to": "收件人",
@@ -1645,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "電子郵件地址為必填項",
-    "folderLimitMustBeAtLeast100": "資料夾限制必須至少為 100",
-    "folderLimitMustBeNumber": "資料夾限制必須是數字",
    "imapHostCannotBeEmpty": "IMAP 主機不可為空",
    "imapHostRequired": "IMAP 主機為必填項",
    "imapPortMustBeLessThan65536": "IMAP 連接埠必須小於 65536",
    "imapPortMustBePositive": "IMAP 連接埠必須是正整數",
    "incrementalSyncMustBeAtLeast10": "增量同步間隔必須至少為 10 分鐘",
    "incrementalSyncMustBeNumber": "增量同步間隔必須是數字",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "無效的電子郵件地址",
    "invalidUrl": "無效的網址",
    "passwordMinLength": "密碼長度必須至少 {{min}} 個字元",
@@ -1664,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "批次大小必須最多為200",
    "singleRequestBatchSizeTooSmall": "批次大小必須至少為10"
  }
-}
+}
--- a/web/src/locales/zh.json
+++ b/web/src/locales/zh.json
@@ -115,6 +115,24 @@
    "continue": "继续",
    "createdAt": "创建时间",
    "creationFailed": "创建失败，请稍后重试",
+    "cronAdvanced": "高级表达式",
+    "cronDaily": "每天",
+    "cronDayOfMonth": "星期",
+    "cronDayOfWeek": "星期",
+    "cronFrequency": "频率",
+    "cronFriday": "星期五",
+    "cronHour": "小时",
+    "cronMinute": "分钟",
+    "cronMonday": "星期一",
+    "cronMonthly": "每月",
+    "cronSaturday": "星期六",
+    "cronSimple": "简易表达式",
+    "cronSunday": "星期日",
+    "cronThursday": "星期四",
+    "cronTimezoneNote": "所有时间均使用服务器本地时区。",
+    "cronTuesday": "星期二",
+    "cronWednesday": "星期三",
+    "cronWeekly": "每周",
    "dateSelection": "日期选择",
    "dateSince": "起始日期",
    "days": "天",
@@ -133,6 +151,9 @@
    "downloadFailed": "启动下载任务失败",
    "downloadInterval": "下载周期 (分钟)",
    "downloadIntervalPlaceholder": "请输入分钟数",
+    "downloadSchedule": "Cron Schedule",
+    "downloadScheduleDescription": "服务器时间的 6 位 Cron 表达式（秒分时日月周），提供时覆盖间隔设置。",
+    "downloadSchedulePlaceholder": "例如：0 0 * * *",
    "downloadScope": "下载策略",
    "downloadScopeDescription": "选择哪些邮件应被索引和下载。",
    "downloadStarted": "下载任务已启动",
@@ -156,9 +177,6 @@
    "everyMinutes": "每 {{minutes}} 分钟",
    "field": "字段",
    "fixed": "固定",
-    "folderLimit": "文件夹限制",
-    "folderLimitDescription": "限制每个文件夹同步的邮件数量（最少 100）。留空表示不限制。",
-    "folderLimitPlaceholder": "例如 1000",
    "folderSync": {
      "autoSelectDescendants": "自动选择子项",
      "autoSelectParents": "自动选择父项",
@@ -247,6 +265,10 @@
      }
    },
    "saveChanges": "保存更改",
+    "scheduleMode": "下载调度",
+    "scheduleModeCron": "Cron 表达式",
+    "scheduleModeDescription": "设置固定间隔或 Cron 表达式下载邮件。",
+    "scheduleModeInterval": "固定间隔",
    "selectAccountType": "选择邮件账户类型",
    "selectAtLeastOneFolder": "请至少选择一个文件夹",
    "selectAuthMethod": "选择认证方法",
@@ -557,6 +579,7 @@
    "account": "账户",
    "attachments": "附件",
    "bcc": "密送",
+    "blockRemoteAgain": "重新阻止",
    "cc": "抄送",
    "clickToDownload": "点击下载",
    "date": "日期",
@@ -576,8 +599,11 @@
    "noMessageSelected": "未选择消息",
    "noTagsYet": "暂无标签",
    "onlyNonInlineAttachments": "此处仅显示非内联附件。",
+    "remoteBlocked": "为了保护您的隐私，Bichon 已阻止此邮件中的远程内容。",
+    "remoteShown": "已显示远程 content。",
    "showLess": "显示更少",
    "showMore": "显示更多...",
+    "showRemoteContent": "显示远程内容",
    "subject": "主题",
    "tags": "标签",
    "to": "收件人",
@@ -1646,14 +1672,13 @@
  },
  "validation": {
    "emailRequired": "邮箱为必填项",
-    "folderLimitMustBeAtLeast100": "文件夹限制必须至少为 100",
-    "folderLimitMustBeNumber": "文件夹限制必须是数字",
    "imapHostCannotBeEmpty": "IMAP 主机不能为空",
    "imapHostRequired": "IMAP 主机为必填项",
    "imapPortMustBeLessThan65536": "IMAP 端口必须小于 65536",
    "imapPortMustBePositive": "IMAP 端口必须是正整数",
    "incrementalSyncMustBeAtLeast10": "增量同步间隔必须至少为 10 分钟",
    "incrementalSyncMustBeNumber": "增量同步间隔必须是数字",
+    "invalidCronExpression": "Invalid cron expression. Must be 6 fields: second minute hour day-of-month month day-of-week (e.g. '0 0 0 * * *')",
    "invalidEmail": "无效的电子邮件地址",
    "invalidUrl": "无效的 URL",
    "passwordMinLength": "密码长度至少为 {{min}} 个字符",
@@ -1665,4 +1690,4 @@
    "singleRequestBatchSizeTooLarge": "批大小必须最多为200",
    "singleRequestBatchSizeTooSmall": "批大小必须至少为10"
  }
-}
+}
Author	SHA1	Message	Date
rustmailer	86869ac848	Update release.yml	2026-05-26 20:11:49 +08:00
rustmailer	38453accc6	Update release.yml	2026-05-26 20:07:40 +08:00
rustmailer	a60b2c7dc4	Update release.yml	2026-05-26 20:02:55 +08:00
rustmailer	8e46c7a162	fix: use valid IMAP UID SEARCH instead of BEFORE in UID FETCH for incremental sync	2026-05-26 19:42:26 +08:00
rustmailer	1a615e1c45	bump to v1.4.0	2026-05-26 15:27:34 +08:00
rustmailer	83dd9cdd6b	perf: optimize IMAP account fetch flow	2026-05-26 15:23:34 +08:00
rustmailer	f30cd66e00	feat: remove folder limit	2026-05-26 15:22:14 +08:00
rustmailer	4bd714a670	chore: remove custom global allocator	2026-05-26 15:20:59 +08:00
rustmailer	c0a63a1e3c	feat: enhance autoconfig detection	2026-05-26 15:19:39 +08:00
rustmailer	04a022e850	add features endpoint	2026-05-24 20:31:58 +08:00
rustmailer	f9c2fc77ff	feat(core): wire up attachment text extraction in IMAP sync pipeline	2026-05-24 19:52:28 +08:00
rustmailer	ec3e842bbb	chore: add trace logging for duplicate email diagnosis #214	2026-05-24 17:27:01 +08:00
rustmailer	7311529908	bump to v1.3.0	2026-05-24 16:50:15 +08:00
rustmailer	0792bb546d	perf: reduce tokio worker thread blocking to improve responsiveness on low-core machines - Switch memdb durability from Full to Batch(100) with 10s flush worker - Offload BlobManager fjall writes to spawn_blocking - Wrap Tantivy commit operations in block_in_place - Flush memdb WAL on graceful shutdown	2026-05-24 14:34:16 +08:00
rustmailer	0be2670600	update	2026-05-24 02:37:22 +08:00
rustmailer	575f851cfb	update	2026-05-24 02:27:52 +08:00
rustmailer	61430b72b0	feat(core): add ext module with EventBus and AttachmentTextExtractor traits	2026-05-24 02:04:28 +08:00
rustmailer	15c0cfc1d9	Update README.md	2026-05-23 15:57:39 +08:00
rustmailer	ea8c493374	Update .gitignore	2026-05-23 15:41:39 +08:00
rustmailer	005b1c2116	feat: added Cron scheduling for email downloads #211	2026-05-23 15:40:46 +08:00
rustmailer	d8b78b8010	update	2026-05-23 12:08:49 +08:00
rustmailer	36f3f19cdc	fix(core): use email schema field for attachment hash lookup in cleanup_unused_content	2026-05-23 11:36:47 +08:00
rustmailer	9f3097df32	Merge pull request #259 from mmaudet/feat/search-by-server-timestamp feat: filter and sort search-messages by a server-side timestamp	2026-05-23 11:04:54 +08:00
rustmailer	c075b9ef12	Merge pull request #258 from mmaudet/fix/self-heal-missing-content fix: self-heal a missing content blob in download-message	2026-05-23 11:03:04 +08:00
rustmailer	21a7f7e9d5	Merge pull request #257 from mmaudet/fix/gc-blob-still-referenced fix: prevent the dedup GC from deleting a still-referenced content blob	2026-05-23 10:58:34 +08:00
rustmailer	26c14fcaaf	refactor(migrate): use searchable_segment_ids() instead of reader() for merge #261	2026-05-23 10:26:09 +08:00
Michel-Marie MAUDET	6873841ba4	fix(search): expose new SortBy variants via #[oai(rename)] InternalDate and IngestAt were renamed for the wire with #[serde(rename)] only. SortBy derives poem_openapi::Enum, which does not honour serde attributes, so the REST deserializer exposed them under their Rust identifiers instead of the intended INTERNAL_DATE / INGEST_AT — inconsistent with the existing DATE/SIZE values and rejecting the documented names with HTTP 400. Add #[oai(rename = ...)] alongside the serde rename. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-22 23:14:01 +02:00
rustmailer	0dd81f599d	update	2026-05-22 22:21:46 +08:00
Michel-Marie MAUDET	b3afc52a82	feat(search): filter and sort messages by server-side timestamps POST /api/v1/search-messages previously filtered and sorted only on the sender-controlled Date: header. Add support for two server-controlled timestamps that are already indexed as FAST i64 fields: - internal_date (IMAP INTERNALDATE) - ingest_at (Bichon's archival time) EmailSearchFilter gains internal_date_since/before and ingest_since/before range bounds, mirroring the existing `since`/`before` Date: handling. SortBy gains InternalDate and IngestAt variants (wire values INTERNAL_DATE and INGEST_AT), mirroring the existing DATE/SIZE sort handling. The envelope and attachment Tantivy schemas already declare these fields as INDEXED \| STORED \| FAST, so no re-index or migration is required. Attachments carry no IMAP INTERNALDATE, so the attachment search maps the InternalDate sort to the attachment's own date field as a defined fallback. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-22 13:55:23 +02:00
Michel-Marie MAUDET	171a40d70f	fix: self-heal missing content blob in download-message The download-message REST endpoint returned 404 [30000] "Original email content not found" whenever an indexed message's raw content blob was missing from the blob store, leaving the message permanently unrecoverable even though it still existed on the IMAP server. Make the endpoint self-healing: when the content blob is absent, fetch that one message on demand from the IMAP server via UID FETCH <uid> (BODY.PEEK[]), repopulate the detached blob, and return the content. The 404 is now only produced when the on-demand fetch itself fails (mailbox gone, UID gone, connection failure, or the fetched bytes no longer match the archived content_hash). - Add ImapExecutor::fetch_single_message_body: examines the mailbox read-only and fetches one message by UID, reusing the existing BODY.PEEK[] fetch command. - Add reattach_eml_content_self_healing / recover_message_blob in the envelope extractor: fast-path delegates to reattach_eml_content when the blob exists; otherwise recovers it via IMAP and re-stores the stripped EML + attachments through the existing blob queue. - Make store::blob::get_reader async and route it through the self-healing path; update the single caller (download_message). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-22 13:46:40 +02:00
Michel-Marie MAUDET	895ea543a9	fix(core): commit/reload barrier before dedup GC reference count cleanup_unused_content decides whether to delete a deduplicated blob by running a Tantivy Count of envelopes referencing each content_hash. The searcher it used reflected only the committed index state at the time it was built, so an envelope that shared a content hash but was still sitting uncommitted in the IndexWriter buffer (for example added by the background ingest task before the delete operation acquired the writer lock) was invisible to the count. The count read 0 and a still-referenced blob was deleted, permanently 404ing that envelope's download-message. Pass the locked IndexWriter into cleanup_unused_content and fatal_commit it immediately before creating the searcher. create_searcher already reloads the reader, so the Count is now evaluated against a fully committed, freshly-reloaded index state. The barrier is local to the GC path and self-contained, independent of what the caller committed. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-22 13:40:43 +02:00
rustmailer	6eca351994	update i18n	2026-05-21 23:52:26 +08:00
rustmailer	1f477eca65	bump to v1.2.0	2026-05-21 23:33:26 +08:00
rustmailer	a3cdc094e8	feat: Strip remote data from emails when viewed #54	2026-05-21 23:32:42 +08:00