diff --git a/mail/snappymail/Makefile b/mail/snappymail/Makefile
index 65ecf3ed20e7..c202afa3fb46 100644
--- a/mail/snappymail/Makefile
+++ b/mail/snappymail/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	snappymail
 DISTVERSION=	2.35.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	https://github.com/the-djmaze/snappymail/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Simple, modern, lightweight & fast web-based email client
 WWW=		https://snappymail.eu/
 
 LICENSE=	AGPLv3
 
 RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}APCu>0:devel/pecl-APCu@${PHP_FLAVOR} \
 		${PECL_PKGNAMEPREFIX}uuid>0:devel/pecl-uuid@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 USE_PHP=	ctype curl dom fileinfo gd iconv intl mbstring phar sodium tidy \
 		xml zip zlib
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 NO_WRKSUBDIR=	yes
 
 PLIST_SUB=	VER="${PORTVERSION}" \
 		WWWGRP="${WWWGRP}" \
 		WWWOWN="${WWWOWN}"
 
 OPTIONS_DEFINE=		GNUPG LDAP MYSQL PGSQL REDIS SQLITE3
 OPTIONS_DEFAULT=	GNUPG LDAP MYSQL PGSQL REDIS SQLITE3
 
 GNUPG_RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}gnupg>0:security/pecl-gnupg@${PHP_FLAVOR}
 LDAP_USE=		PHP=ldap
 MYSQL_USE=		PHP=pdo_mysql
 PGSQL_USE=		PHP=pdo_pgsql
 REDIS_RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}redis>0:databases/pecl-redis@${PHP_FLAVOR}
 SQLITE3_USE=		PHP=pdo_sqlite
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 	${RM} -r ${STAGEDIR}${WWWDIR}/data
 	${MKDIR} ${STAGEDIR}${WWWDIR}/data
 
 .include <bsd.port.mk>
diff --git a/mail/snappymail/files/patch-snappymail_v_2.35.2_app_libraries_RainLoop_Actions.php b/mail/snappymail/files/patch-snappymail_v_2.35.2_app_libraries_RainLoop_Actions.php
new file mode 100644
index 000000000000..861cd117553e
--- /dev/null
+++ b/mail/snappymail/files/patch-snappymail_v_2.35.2_app_libraries_RainLoop_Actions.php
@@ -0,0 +1,11 @@
+--- snappymail/v/2.35.2/app/libraries/RainLoop/Actions.php.orig	2024-03-08 05:14:45 UTC
++++ snappymail/v/2.35.2/app/libraries/RainLoop/Actions.php
+@@ -668,7 +668,7 @@ class Actions
+ 					$sPassword = \substr(\base64_encode(\random_bytes(16)), 0, 12);
+ 					Utils::saveFile($passfile, $sPassword . "\n");
+ //					\chmod($passfile, 0600);
+-					$oConfig->SetPassword($sPassword);
++					$oConfig->SetPassword(new \SnappyMail\SensitiveString($sPassword));
+ 					$oConfig->Save();
+ 				}
+ 			}