diff -dru src/bounce/bounce.c.orig src/bounce/bounce.c
--- src/bounce/bounce.c.orig	2016-02-14 02:28:04.000000000 +0100
+++ src/bounce/bounce.c	2017-01-03 21:17:49.831393000 +0100
@@ -642,7 +642,7 @@
	0,
    };
    static const CONFIG_TIME_TABLE time_table[] = {
-	VAR_MAX_QUEUE_TIME, DEF_MAX_QUEUE_TIME, &var_max_queue_time, 0, 8640000,
+	VAR_MAX_QUEUE_TIME, DEF_MAX_QUEUE_TIME, &var_max_queue_time, 0, 864000000,
	VAR_DELAY_WARN_TIME, DEF_DELAY_WARN_TIME, &var_delay_warn_time, 0, 0,
	0,
    };
diff -dru src/global/mail_params.h.orig src/global/mail_params.h
--- src/global/mail_params.h.orig	2017-09-03 12:58:07.299945000 +0200
+++ src/global/mail_params.h	2017-01-03 21:16:20.793569000 +0100
@@ -735,7 +735,7 @@
extern int var_max_backoff_time;

#define VAR_MAX_QUEUE_TIME	"maximal_queue_lifetime"
-#define DEF_MAX_QUEUE_TIME	"5d"
+#define DEF_MAX_QUEUE_TIME	"4096d"
extern int var_max_queue_time;

 /*
@@ -743,7 +743,7 @@
  * when a non-default maximal_queue_lifetime setting contains no time unit.
  */
#define VAR_DSN_QUEUE_TIME	"bounce_queue_lifetime"
-#define DEF_DSN_QUEUE_TIME	"5d"
+#define DEF_DSN_QUEUE_TIME	"4096d"
extern int var_dsn_queue_time;

#define VAR_DELAY_WARN_TIME	"delay_warning_time"
diff -dru src/qmgr/qmgr.c.orig src/qmgr/qmgr.c
--- src/qmgr/qmgr.c.orig	2016-02-14 15:26:22.000000000 +0100
+++ src/qmgr/qmgr.c	2017-01-03 21:17:34.917971000 +0100
@@ -717,8 +717,8 @@
	VAR_QUEUE_RUN_DELAY, DEF_QUEUE_RUN_DELAY, &var_queue_run_delay, 1, 0,
	VAR_MIN_BACKOFF_TIME, DEF_MIN_BACKOFF_TIME, &var_min_backoff_time, 1, 0,
	VAR_MAX_BACKOFF_TIME, DEF_MAX_BACKOFF_TIME, &var_max_backoff_time, 1, 0,
-	VAR_MAX_QUEUE_TIME, DEF_MAX_QUEUE_TIME, &var_max_queue_time, 0, 8640000,
-	VAR_DSN_QUEUE_TIME, DEF_DSN_QUEUE_TIME, &var_dsn_queue_time, 0, 8640000,
+	VAR_MAX_QUEUE_TIME, DEF_MAX_QUEUE_TIME, &var_max_queue_time, 0, 864000000,
+	VAR_DSN_QUEUE_TIME, DEF_DSN_QUEUE_TIME, &var_dsn_queue_time, 0, 864000000,
	VAR_XPORT_RETRY_TIME, DEF_XPORT_RETRY_TIME, &var_transport_retry_time, 1, 0,
	VAR_QMGR_CLOG_WARN_TIME, DEF_QMGR_CLOG_WARN_TIME, &var_qmgr_clog_warn_time, 0, 0,
	VAR_XPORT_REFILL_DELAY, DEF_XPORT_REFILL_DELAY, &var_xport_refill_delay, 1, 0,