diff --git a/.env.prod b/.env.prod
index 467e43588f..b886665d59 100644
--- a/.env.prod
+++ b/.env.prod
@@ -7,7 +7,7 @@ FLEET=eth.beta
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL_STATUS_GO=
 LOG_LEVEL=info
-MAILSERVER_CONFIRMATIONS_ENABLED=0
+MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=0
diff --git a/src/status_im/node/core.cljs b/src/status_im/node/core.cljs
index 7d650ac33b..5d889a71ff 100644
--- a/src/status_im/node/core.cljs
+++ b/src/status_im/node/core.cljs
@@ -120,9 +120,10 @@
                                        :LightClient true
                                        :MinimumPoW 0.001
                                        :EnableNTPSync true}
-             :ShhextConfig        {:BackupDisabledDataDir (utils.platform/no-backup-directory)
-                                   :InstallationID          installation-id
-                                   :MailServerConfirmations config/mailserver-confirmations-enabled?
+             :ShhextConfig        {:BackupDisabledDataDir      (utils.platform/no-backup-directory)
+                                   :InstallationID             installation-id
+                                   :MaxMessageDeliveryAttempts config/max-message-delivery-attempts
+                                   :MailServerConfirmations    config/mailserver-confirmations-enabled?
                                    :PFSEnabled              true}
              :RequireTopics           (get-topics network))
 
diff --git a/src/status_im/utils/config.cljs b/src/status_im/utils/config.cljs
index 09f326dd01..b0725bc351 100644
--- a/src/status_im/utils/config.cljs
+++ b/src/status_im/utils/config.cljs
@@ -32,6 +32,7 @@
 (def erc20-contract-warnings-enabled? (enabled? (get-config :ERC20_CONTRACT_WARNINGS)))
 (def partitioned-topic-enabled? (enabled? (get-config :PARTITIONED_TOPIC "0")))
 (def tr-to-talk-enabled? (enabled? (get-config :TRIBUTE_TO_TALK 0)))
+(def max-message-delivery-attempts (js/parseInt (get-config :MAX_MESSAGE_DELIVERY_ATTEMPTS "6")))
 
 ;; CONFIG VALUES
 (def log-level