diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index c2a578730e0e..676d356b1836 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,91 +1,91 @@
 PORTNAME=	roundcube
-DISTVERSION=	1.5.2
+DISTVERSION=	1.5.3
 PORTEPOCH=	1
 CATEGORIES?=	mail www
 MASTER_SITES=	https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}mail-${DISTVERSION}-complete
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Fully skinnable XHTML/CSS webmail written in PHP
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe php:web,flavors
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}mail-${DISTVERSION}
 
 RCUBECOMP=	SQL config .htaccess index.php installer logs \
 		plugins program skins temp vendor
 PORTDOCS=	CHANGELOG.md INSTALL README.md UPGRADING
 
 CPE_PRODUCT=	webmail
 CPE_VENDOR=	roundcube
 
 USE_PHP=	pcre mbstring session iconv dom xml json intl zip filter openssl fileinfo exif ctype
 IGNORE_WITH_PHP=81 82
 
 OPTIONS_DEFINE=	LDAP GD PSPELL NSC DOCS EXAMPLES
 OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=MYSQL
 
 DB_DESC=	Database backend
 MYSQL_DESC=	Use MySQL backend
 PGSQL_DESC=	Use PostgreSQL backend
 SQLITE_DESC=	Use SQLite backend
 LDAP_DESC=	Enable LDAP support (address book)
 GD_DESC=	Enable GD support (image conversion)
 PSPELL_DESC=	Enable PSpell support (internal spellcheck)
 NSC_DESC=	Install network spellchecker
 
 GD_VARS=	use_php+=gd
 LDAP_VARS=	use_php+=ldap
 MYSQL_VARS=	use_php+=pdo_mysql
 NSC_IMPLIES=	PSPELL
 NSC_VARS=	use_php+=simplexml
 PGSQL_VARS=	use_php+=pdo_pgsql
 PSPELL_VARS=	use_php+=pspell
 SQLITE_VARS=	use_php+=pdo_sqlite
 
 SUB_FILES=	newsyslog.conf
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -type f -delete
 	@${RMDIR} ${WRKSRC}/plugins/archive/skins/larry
 
 do-install:
 	-${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR}
 .for i in ${RCUBECOMP}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR}
 .endfor
 	@(cd ${WRKSRC}; ${FIND} bin ${RCUBECOMP} -not -type d) | ${SORT} | \
 		${SED} -ne 's,^,${WWWDIR_REL}/,p' >> ${TMPPLIST}
 	@${ECHO_CMD} '@postexec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/logs' \
 		>> ${TMPPLIST}
 	@${ECHO_CMD} '@postexec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/temp' \
 		>> ${TMPPLIST}
 
 do-install-NSC-on:
 	@${INSTALL_DATA} ${FILESDIR}/spellchecker.php ${STAGEDIR}${WWWDIR}
 	@${ECHO_CMD} '${WWWDIR_REL}/spellchecker.php' >> ${TMPPLIST}
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/newsyslog.conf ${STAGEDIR}${EXAMPLESDIR}
 	@${ECHO_CMD} '@dir etc/newsyslog.conf.d' \
 		>> ${TMPPLIST}
 	@${ECHO_CMD} '@sample ${EXAMPLESDIR}/newsyslog.conf etc/newsyslog.conf.d/roundcube.conf' \
 		>> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 7cda96f56728..4df07af77491 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641810015
-SHA256 (roundcubemail-1.5.2-complete.tar.gz) = f03968381156fe790d858af7e069c5550a8577fb964f96624434895272053838
-SIZE (roundcubemail-1.5.2-complete.tar.gz) = 7852981
+TIMESTAMP = 1656320094
+SHA256 (roundcubemail-1.5.3-complete.tar.gz) = 4bcfac219f2e0005c912dac3227743cc1ed0ded69c822f74c81a70d041e5a3bd
+SIZE (roundcubemail-1.5.3-complete.tar.gz) = 7857655
diff --git a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
index 081df4ae93da..889547b8d3a9 100644
--- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
+++ b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
@@ -1,12 +1,12 @@
---- program/lib/Roundcube/rcube_message.php.orig	2021-10-19 08:32:55.709205000 +0200
-+++ program/lib/Roundcube/rcube_message.php	2021-10-19 08:34:30.613574000 +0200
-@@ -910,8 +910,7 @@
+--- program/lib/Roundcube/rcube_message.php.orig	2022-06-26 20:26:58 UTC
++++ program/lib/Roundcube/rcube_message.php
+@@ -914,8 +914,7 @@ class rcube_message
                  else if (
                      preg_match('/^(inline|attach)/', $mail_part->disposition)
-                     || $mail_part->headers['content-id']
+                     || !empty($mail_part->headers['content-id'])
 -                    || ($mail_part->filename &&
 -                        (empty($mail_part->disposition) || preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
 +                    || $mail_part->filename
                  ) {
                      // skip apple resource forks
                      if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') {