diff --git a/19.0-rc/apache/config/smtp.config.php b/19.0-rc/apache/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/19.0-rc/apache/config/smtp.config.php
+++ b/19.0-rc/apache/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/19.0-rc/fpm-alpine/config/smtp.config.php b/19.0-rc/fpm-alpine/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/19.0-rc/fpm-alpine/config/smtp.config.php
+++ b/19.0-rc/fpm-alpine/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/19.0-rc/fpm/config/smtp.config.php b/19.0-rc/fpm/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/19.0-rc/fpm/config/smtp.config.php
+++ b/19.0-rc/fpm/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/19.0/apache/config/smtp.config.php b/19.0/apache/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/19.0/apache/config/smtp.config.php
+++ b/19.0/apache/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/19.0/fpm-alpine/config/smtp.config.php b/19.0/fpm-alpine/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/19.0/fpm-alpine/config/smtp.config.php
+++ b/19.0/fpm-alpine/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/19.0/fpm/config/smtp.config.php b/19.0/fpm/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/19.0/fpm/config/smtp.config.php
+++ b/19.0/fpm/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/20.0/apache/config/smtp.config.php b/20.0/apache/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/20.0/apache/config/smtp.config.php
+++ b/20.0/apache/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/20.0/fpm-alpine/config/smtp.config.php b/20.0/fpm-alpine/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/20.0/fpm-alpine/config/smtp.config.php
+++ b/20.0/fpm-alpine/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/20.0/fpm/config/smtp.config.php b/20.0/fpm/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/20.0/fpm/config/smtp.config.php
+++ b/20.0/fpm/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/21.0/apache/config/smtp.config.php b/21.0/apache/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/21.0/apache/config/smtp.config.php
+++ b/21.0/apache/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/21.0/fpm-alpine/config/smtp.config.php b/21.0/fpm-alpine/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/21.0/fpm-alpine/config/smtp.config.php
+++ b/21.0/fpm-alpine/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/21.0/fpm/config/smtp.config.php b/21.0/fpm/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/21.0/fpm/config/smtp.config.php
+++ b/21.0/fpm/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/22.0-beta/apache/config/smtp.config.php b/22.0-beta/apache/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/22.0-beta/apache/config/smtp.config.php
+++ b/22.0-beta/apache/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/22.0-beta/fpm-alpine/config/smtp.config.php b/22.0-beta/fpm-alpine/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/22.0-beta/fpm-alpine/config/smtp.config.php
+++ b/22.0-beta/fpm-alpine/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/22.0-beta/fpm/config/smtp.config.php b/22.0-beta/fpm/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/22.0-beta/fpm/config/smtp.config.php
+++ b/22.0-beta/fpm/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/22.0/apache/config/smtp.config.php b/22.0/apache/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/22.0/apache/config/smtp.config.php
+++ b/22.0/apache/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/22.0/fpm-alpine/config/smtp.config.php b/22.0/fpm-alpine/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/22.0/fpm-alpine/config/smtp.config.php
+++ b/22.0/fpm-alpine/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {
diff --git a/22.0/fpm/config/smtp.config.php b/22.0/fpm/config/smtp.config.php
index af9f35a8..62880e4b 100644
--- a/22.0/fpm/config/smtp.config.php
+++ b/22.0/fpm/config/smtp.config.php
@@ -13,7 +13,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN'))
   );
 
   if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
-      $CONFIG['mail_smtppassword'] = rtrim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
   } elseif (getenv('SMTP_PASSWORD')) {
       $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
   } else {