diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 82faef54d173..6693644c164d 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -17,7 +17,7 @@ PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	# see below.
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	johans@FreeBSD.org
+MAINTAINER=	johans@stack.nl
 COMMENT=	Modern branch of an old mail user agent
 
 # not needed since config.sh is generated by scripts/pre-configure.
@@ -60,7 +60,8 @@ PLIST_SUB=	SO_REV="${SO_REV}" \
 		${ELM_UNSHLIBS:U:S/^/ELM_/:S/$/="@comment "/}
 
 MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 elmbindata.1 \
-		elmcharset.1 elmlibregister.1 elmrc-write.1 elmregister.1 \
+		elmcharset.1 elmlibregister.1 elmmimetypes.1 \
+		elmrc-write.1 elmregister.1 \
 		elmstringconvert.1 elmterminal.1 elmunidata.1 elmuninstall.1 \
 		fastmail.1 frm.1 listalias.1 messages.1 newalias.1 newmail.1 \
 		printmail.1 prlong.1 readmsg.1
@@ -80,8 +81,8 @@ OPTIONS=	ELM_ICONV "libiconv support" on \
 #
 
 ELM_VERSION=	2.4
-ELM_REVISION=	122
-ELM_PATCHLEVEL=	i	# a...z = patch-level, _ means no patch-level.
+ELM_REVISION=	123
+ELM_PATCHLEVEL=	c	# a...z = patch-level, _ means no patch-level.
 
 ELM_PATCHDONE=	false
 .for level in _ a b c d e f g h i j k l m n o p q r s t u v w x y z
@@ -171,7 +172,7 @@ fix-permissions:
 patch-setgid:
 	@if [ "$$(/sbin/sysctl -n kern.saved_ids)" -eq 0 ]; then \
 	    ${REINPLACE_CMD} -e 's|setgid|setegid|' \
-		${WRKSRC}/lib/localmbx.c \
+		${WRKSRC}/lib/mbox/localmbx.c \
 		${WRKSRC}/src/init.c ${WRKSRC}/src/lock.c; \
 	    ${REINPLACE_CMD} -e 's|have_saved_ids = 0|have_saved_ids = 1|' \
 		${WRKSRC}/lib/read_rc.c; \
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 6d5aa1142323..eaebe67a02cf 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1,30 +1,12 @@
-MD5 (elm-2.4ME+122.tar.gz) = f20df2de6278cac0b00c4bc64ab9932e
-SHA256 (elm-2.4ME+122.tar.gz) = ed75a72f4bd7d23a6506a1ad049a44b5506271c29156f161f58f864a0d5776f0
-SIZE (elm-2.4ME+122.tar.gz) = 1519057
-MD5 (elm-2.4ME+PL122a.patch.gz) = 0b6ff710d21253518f3ce940a615306f
-SHA256 (elm-2.4ME+PL122a.patch.gz) = f5d15967e08c4c6e6805d839c56715e6a86d646aa3fdaaa5bfe8d3d0cd3b8954
-SIZE (elm-2.4ME+PL122a.patch.gz) = 3546
-MD5 (elm-2.4ME+PL122b.patch.gz) = c1e83b57bdbe3fbde3db666097cf017c
-SHA256 (elm-2.4ME+PL122b.patch.gz) = 14792d2be86c1f662ffa4237215de280ad84cca414acc037b5076ca9f07ff301
-SIZE (elm-2.4ME+PL122b.patch.gz) = 18764
-MD5 (elm-2.4ME+PL122c.patch.gz) = 8ad52019a60434523e81262c85458da5
-SHA256 (elm-2.4ME+PL122c.patch.gz) = 5fa6680f98e6215c162fdad63b9a16d7190e6c9407225eb532e2a88388afc2d2
-SIZE (elm-2.4ME+PL122c.patch.gz) = 3325
-MD5 (elm-2.4ME+PL122d.patch.gz) = 03fc6e9cf6fedac38d9043622144395e
-SHA256 (elm-2.4ME+PL122d.patch.gz) = f6047d9b6b22ee246d02685bebe2533076051cdaaed6e6bc50ea6886a23b5246
-SIZE (elm-2.4ME+PL122d.patch.gz) = 12432
-MD5 (elm-2.4ME+PL122e.patch.gz) = ce964330c86d670a30ab093530f5f69f
-SHA256 (elm-2.4ME+PL122e.patch.gz) = 9f9a0971b52aa8492166076a5874852ef122dfd5a8373fdf2d29b643f855b61c
-SIZE (elm-2.4ME+PL122e.patch.gz) = 2272
-MD5 (elm-2.4ME+PL122f.patch.gz) = 211a2ed7a318883007c118e7144ff509
-SHA256 (elm-2.4ME+PL122f.patch.gz) = def8a17c82d1524ead7152c1653a5897f690e032c96c059d298b1539e201101e
-SIZE (elm-2.4ME+PL122f.patch.gz) = 1732
-MD5 (elm-2.4ME+PL122g.patch.gz) = 086fb0f47397d925bed98dbb1a14a094
-SHA256 (elm-2.4ME+PL122g.patch.gz) = 3e2b4c02e544b57bb01891f65ac320f68c2ce2b6c6d7bd0fbfd3ad932d64aff1
-SIZE (elm-2.4ME+PL122g.patch.gz) = 2585
-MD5 (elm-2.4ME+PL122h.patch.gz) = 687b25ef3c6e465fb5aaeae4f106a3c9
-SHA256 (elm-2.4ME+PL122h.patch.gz) = e93c20888c49397921441085e645cc166695577c2a7c10ae07b4b9f1ad98726b
-SIZE (elm-2.4ME+PL122h.patch.gz) = 4169
-MD5 (elm-2.4ME+PL122i.patch.gz) = aa7d9cbda04e16f6e9612495bca0575f
-SHA256 (elm-2.4ME+PL122i.patch.gz) = 7ff1a09dc50e6dc0d65b7bcadf485f633d0094254b76134920f8c121503af28c
-SIZE (elm-2.4ME+PL122i.patch.gz) = 2847
+MD5 (elm-2.4ME+123.tar.gz) = ca4e4dedb7372ead426a1c9d8addc296
+SHA256 (elm-2.4ME+123.tar.gz) = 483e0b84a9d046afa038e1357d1a45883a2863397862788219b87e8794581f23
+SIZE (elm-2.4ME+123.tar.gz) = 1659634
+MD5 (elm-2.4ME+PL123a.patch.gz) = 84d45332a073053b32279980304f0bdb
+SHA256 (elm-2.4ME+PL123a.patch.gz) = 0a928fcb7b9c24779777433ea343fb0b3c89640b448c2c75145e69a139592af1
+SIZE (elm-2.4ME+PL123a.patch.gz) = 6330
+MD5 (elm-2.4ME+PL123b.patch.gz) = 0894ddc739f54f1287efb645b05ec4c2
+SHA256 (elm-2.4ME+PL123b.patch.gz) = 8a1b79976dbdcaffa21af4769837c3bfd653a1548ea687dac59b56bc7ae39254
+SIZE (elm-2.4ME+PL123b.patch.gz) = 3221
+MD5 (elm-2.4ME+PL123c.patch.gz) = dac5f257ecfa4bea8e0d73ac2a0eec74
+SHA256 (elm-2.4ME+PL123c.patch.gz) = 1163aebb99b2ad357887099c044d686071f12998767f2be488d1584751783f40
+SIZE (elm-2.4ME+PL123c.patch.gz) = 3370
diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index 11b4edf162f8..f80dc12423d1 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -19,10 +19,12 @@ bin/readmsg
 %%CONF_DIR%%/elm.filelist
 @unexec if cmp -s %D/%%CONF_DIR%%/elm.mimecharsets %D/%%CONF_DIR%%/elm.mimecharsets-dist; then rm -f %D/%%CONF_DIR%%/elm.mimecharsets; fi
 %%CONF_DIR%%/elm.mimecharsets-dist
+%%CONF_DIR%%/elm.mimecharsets.NEW
 @exec if [ -f %D/%%LIB_DIR%%/elm.mimecharsets ]; then [ -f %B/elm.mimecharsets ] && old=.old || old=; mv %D/%%LIB_DIR%%/elm.mimecharsets %B/elm.mimecharsets${old}; fi
 @exec [ -f %B/elm.mimecharsets ] || cp %B/%f %B/elm.mimecharsets
 @unexec if cmp -s %D/%%CONF_DIR%%/elm.mimetypes %D/%%CONF_DIR%%/elm.mimetypes-dist; then rm -f %D/%%CONF_DIR%%/elm.mimetypes; fi
 %%CONF_DIR%%/elm.mimetypes-dist
+%%CONF_DIR%%/elm.mimetypes.NEW
 @exec if [ -f %D/%%LIB_DIR%%/elm.mimetypes ]; then [ -f %B/elm.mimetypes ] && old=.old || old=; mv %D/%%LIB_DIR%%/elm.mimetypes %B/elm.mimetypes${old}; fi
 @exec [ -f %B/elm.mimetypes ] || cp %B/%f %B/elm.mimetypes
 @unexec if cmp -s %D/%%CONF_DIR%%/elm.rc %D/%%CONF_DIR%%/elm.rc-dist; then rm -f %D/%%CONF_DIR%%/elm.rc; fi
@@ -31,6 +33,7 @@ bin/readmsg
 @exec [ -f %B/elm.rc ] || cp %B/%f %B/elm.rc
 @unexec if cmp -s %D/%%CONF_DIR%%/elm.terminalinfo %D/%%CONF_DIR%%/elm.terminalinfo-dist; then rm -f %D/%%CONF_DIR%%/elm.terminalinfo; fi
 %%CONF_DIR%%/elm.terminalinfo-dist
+%%CONF_DIR%%/elm.terminalinfo.NEW
 @exec if [ -f %D/%%LIB_DIR%%/elm.terminalinfo ]; then [ -f %B/elm.terminalinfo ] && old=.old || old=; mv %D/%%LIB_DIR%%/elm.terminalinfo %B/elm.terminalinfo${old}; fi
 @exec [ -f %B/elm.terminalinfo ] || cp %B/%f %B/elm.terminalinfo
 %%LIB_DIR%%/elm-help.0
@@ -67,6 +70,7 @@ bin/readmsg
 %%LIB_DIR%%/elmbindata
 %%LIB_DIR%%/elmcharset
 %%LIB_DIR%%/elmlibregister
+%%LIB_DIR%%/elmmimetypes
 %%LIB_DIR%%/elmrc-info
 %%LIB_DIR%%/elmrc-write
 %%LIB_DIR%%/elmregister
@@ -77,6 +81,9 @@ bin/readmsg
 %%LIB_DIR%%/prlong
 %%SHLIB_DIR%%/libelmme-base.so%%SO_REV%%
 %%SHLIB_DIR%%/libelmme-mailer.so%%SO_REV%%
+%%SHLIB_DIR%%/libelmme-mbox.so%%SO_REV%%
+%%SHLIB_DIR%%/libelmme-mime.so%%SO_REV%%
+%%SHLIB_DIR%%/libelmme-misc.so%%SO_REV%%
 %%ELM_ICONV%%%%SHLIB_DIR%%/libelmme-iconv.so%%SO_REV%%
 %%ELM_SMTP%%%%SHLIB_DIR%%/libelmme-smtp.so%%SO_REV%%
 %%ELM_TLS%%%%SHLIB_DIR%%/libelmme-tls.so%%SO_REV%%