diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index c17a10e92759f53902153dd3abb3c9ac9521359e..e4ee2932a571fe51684ca8a41ba70fa7515edb55 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,7 +1,7 @@
 # Created by: Udo Schweigert
 
 PORTNAME=	mutt
-DISTVERSION=	2.2.3
+DISTVERSION=	2.2.4
 CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		https://bitbucket.org/mutt/mutt/downloads/ \
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index e0ec92684b8447afc1c898cad05934cfbf37102b..03d890dc8244c00631a32c47014e6ad47a451558 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1649802229
-SHA256 (mutt/mutt-2.2.3.tar.gz) = 978addcdab454f447ed7d1de84b5767e714c30714285bf82e4a1745071d18d89
-SIZE (mutt/mutt-2.2.3.tar.gz) = 5509344
+TIMESTAMP = 1651351940
+SHA256 (mutt/mutt-2.2.4.tar.gz) = b82776bebff0e10820a33fa1e7eafa5cba4ab3a011b08e83b66ed62d75c6e060
+SIZE (mutt/mutt-2.2.4.tar.gz) = 5515825
 SHA256 (mutt/mutt-2.2.0.vc.greeting) = 7abb467cfaa0ccbfa1fa7cdf8585eefef94e039459ff95fb59efe23043d941d2
 SIZE (mutt/mutt-2.2.0.vc.greeting) = 1979
 SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
diff --git a/mail/mutt/files/extra-patch-ifdef b/mail/mutt/files/extra-patch-ifdef
index 477c82f88186209f6d6330557a4ca40ba2af35f2..6b7f0dc129dae2c3f4ed523fdf9a7a58ce10dd3a 100644
--- a/mail/mutt/files/extra-patch-ifdef
+++ b/mail/mutt/files/extra-patch-ifdef
@@ -1,8 +1,8 @@
---- PATCHES.orig	2022-02-12 23:46:24 UTC
+--- PATCHES.orig	2022-04-30 21:11:31 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.4.cd.ifdef.1
---- init.c.orig	2022-01-25 19:33:16 UTC
+--- init.c.orig	2022-04-12 20:38:51 UTC
 +++ init.c
 @@ -715,6 +715,52 @@ static mbchar_table *parse_mbchar_table (const char *s
    return t;
@@ -57,9 +57,9 @@
  static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err)
  {
    do
---- init.h.orig	2022-02-12 23:46:24 UTC
+--- init.h.orig	2022-04-30 21:11:31 UTC
 +++ init.h
-@@ -4926,6 +4926,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
+@@ -4927,6 +4927,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
  static int parse_unlists (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
  static int parse_alias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
  static int parse_unalias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
@@ -67,7 +67,7 @@
  static int parse_echo (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
  static int parse_ignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
  static int parse_unignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
-@@ -4993,6 +4994,7 @@ const struct command_t Commands[] = {
+@@ -4994,6 +4995,7 @@ const struct command_t Commands[] = {
    { "hdr_order",	parse_list,		{.p=&HeaderOrderList} },
  #ifdef HAVE_ICONV
    { "iconv-hook",	mutt_parse_hook,	{.l=MUTT_ICONVHOOK} },
diff --git a/mail/mutt/files/extra-patch-maildir-mtime b/mail/mutt/files/extra-patch-maildir-mtime
index 0047da9e24dc0c6223f05ee9d66531f7a324603d..73306ef3caadcff0ccbdf5901c72422110c7f803 100644
--- a/mail/mutt/files/extra-patch-maildir-mtime
+++ b/mail/mutt/files/extra-patch-maildir-mtime
@@ -1,8 +1,8 @@
---- PATCHES.orig	2022-02-12 23:46:24 UTC
+--- PATCHES.orig	2022-04-30 21:11:31 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.7.ust.maildir-mtime.2
---- browser.c.orig	2022-01-25 19:33:16 UTC
+--- browser.c.orig	2022-04-21 21:35:19 UTC
 +++ browser.c
 @@ -32,6 +32,7 @@
  #ifdef USE_IMAP
diff --git a/mail/mutt/files/extra-patch-reverse_reply b/mail/mutt/files/extra-patch-reverse_reply
index 35efc80cec42f8e11349e478eadde6ef7b065797..302d69d2017983e9e63f2daf2c85a2a0779fa5d1 100644
--- a/mail/mutt/files/extra-patch-reverse_reply
+++ b/mail/mutt/files/extra-patch-reverse_reply
@@ -1,10 +1,10 @@
---- PATCHES.orig	2022-02-12 23:46:24 UTC
+--- PATCHES.orig	2022-04-30 21:11:31 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.6.cb.reverse_reply.2
---- init.h.orig	2022-02-12 23:46:24 UTC
+--- init.h.orig	2022-04-30 21:11:31 UTC
 +++ init.h
-@@ -3430,6 +3430,13 @@ struct option_t MuttVars[] = {
+@@ -3431,6 +3431,13 @@ struct option_t MuttVars[] = {
    ** In either case, a missing real name will be filled in afterwards
    ** using the value of $$realname.
    */
@@ -18,7 +18,7 @@
    { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=1} },
    /*
    ** .pp
---- mutt.h.orig	2022-02-12 23:46:24 UTC
+--- mutt.h.orig	2022-04-30 21:11:31 UTC
 +++ mutt.h
 @@ -533,6 +533,7 @@ enum
    OPTREVALIAS,
@@ -28,7 +28,7 @@
    OPTRFC2047PARAMS,
    OPTSAVEADDRESS,
    OPTSAVEEMPTY,
---- protos.h.orig	2022-02-09 20:12:23 UTC
+--- protos.h.orig	2022-03-24 21:38:29 UTC
 +++ protos.h
 @@ -86,6 +86,7 @@ char* mutt_extract_message_id (const char *, const cha
  ADDRESS *mutt_get_address (ENVELOPE *, char **);
@@ -38,7 +38,7 @@
  ADDRESS *mutt_remove_adrlist_group_delimiters (ADDRESS *);
  ADDRESS *mutt_expand_aliases (ADDRESS *);
  ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
---- send.c.orig	2022-01-15 20:43:36 UTC
+--- send.c.orig	2022-03-24 21:38:29 UTC
 +++ send.c
 @@ -744,6 +744,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
    /* the CC field can get cluttered, especially with lists */
@@ -51,7 +51,7 @@
    env->cc = mutt_remove_xrefs (env->to, env->cc);
  
    if (env->cc && !env->to)
---- sendlib.c.orig	2022-01-22 23:36:22 UTC
+--- sendlib.c.orig	2022-04-12 20:38:51 UTC
 +++ sendlib.c
 @@ -3093,6 +3093,37 @@ static void set_noconv_flags (BODY *b, short flag)
    }
diff --git a/mail/mutt/files/extra-patch-smartdate b/mail/mutt/files/extra-patch-smartdate
index 40ce4ca583d703823e81b6b8b8a0df6b88a26faf..80c351ff17d198d29f230435f925e07e63f60134 100644
--- a/mail/mutt/files/extra-patch-smartdate
+++ b/mail/mutt/files/extra-patch-smartdate
@@ -1,4 +1,4 @@
---- hdrline.c.orig	2022-02-12 23:46:24 UTC
+--- hdrline.c.orig	2022-04-30 21:11:31 UTC
 +++ hdrline.c
 @@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOPE *env)
   * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
@@ -105,7 +105,7 @@
        if (!do_locales)
          setlocale (LC_TIME, "");
  
---- mutt.h.orig	2022-02-12 23:46:24 UTC
+--- mutt.h.orig	2022-04-30 21:11:31 UTC
 +++ mutt.h
 @@ -168,6 +168,16 @@ typedef enum
    MUTT_WRITE_HEADER_MIME
diff --git a/mail/mutt/files/extra-smime-sender b/mail/mutt/files/extra-smime-sender
index 99aa1a45254c96b23352d82f8ccd5fc3f6794019..2b60f4088a748b89598786aecb1b3d0a98186fdc 100644
--- a/mail/mutt/files/extra-smime-sender
+++ b/mail/mutt/files/extra-smime-sender
@@ -1,4 +1,4 @@
---- commands.c.orig	2021-09-08 11:03:24 UTC
+--- commands.c.orig	2022-03-24 21:38:29 UTC
 +++ commands.c
 @@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur)
      {
@@ -9,9 +9,9 @@
  	  mutt_message ( _("S/MIME signature successfully verified."));
  	else
  	  mutt_error ( _("S/MIME certificate owner does not match sender."));
---- init.h.orig	2022-02-12 23:46:24 UTC
+--- init.h.orig	2022-04-30 21:11:31 UTC
 +++ init.h
-@@ -3927,6 +3927,15 @@ struct option_t MuttVars[] = {
+@@ -3928,6 +3928,15 @@ struct option_t MuttVars[] = {
    ** to determine the key to use. It will ask you to supply a key, if it can't find one.
    ** (S/MIME only)
    */
@@ -27,7 +27,7 @@
    { "smime_self_encrypt_as",	DT_SYN,  R_NONE, {.p="smime_default_key"}, {.p=0} },
    { "smime_default_key",		DT_STR,	 R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
    /*
---- mutt.h.orig	2022-02-12 23:46:24 UTC
+--- mutt.h.orig	2022-04-30 21:11:31 UTC
 +++ mutt.h
 @@ -617,6 +617,7 @@ enum
    OPTSMIMEISDEFAULT,
diff --git a/mail/mutt/files/patch-date-conditional b/mail/mutt/files/patch-date-conditional
index 35bf404ed230e6abd5394dd26c38fef2e4567f7c..ae87993fc64869c75c2d784d0c4c797059c16479 100644
--- a/mail/mutt/files/patch-date-conditional
+++ b/mail/mutt/files/patch-date-conditional
@@ -1,8 +1,8 @@
---- PATCHES.orig	2022-02-12 23:46:24 UTC
+--- PATCHES.orig	2022-04-30 21:11:31 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.0.ats.date_conditional.1
---- hdrline.c.orig	2022-02-12 23:46:24 UTC
+--- hdrline.c.orig	2022-04-30 21:11:31 UTC
 +++ hdrline.c
 @@ -428,6 +428,53 @@ hdr_format_str (char *dest,
        const char *cp;
@@ -58,9 +58,9 @@
  
        p = dest;
  
---- muttlib.c.orig	2021-12-30 20:58:19 UTC
+--- muttlib.c.orig	2022-04-30 19:35:13 UTC
 +++ muttlib.c
-@@ -1681,7 +1681,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1694,7 +1694,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
        if (*src == '?')
        {
  	flags |= MUTT_FORMAT_OPTIONAL;
@@ -78,7 +78,7 @@
        }
        else
        {
-@@ -1697,12 +1706,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1710,12 +1719,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
  	  count++;
  	}
  	*cp = 0;
diff --git a/mail/mutt/files/patch-dgc-deepif b/mail/mutt/files/patch-dgc-deepif
index a91d183f5f9037fbb804c51935b1eb935b7bd99a..a2114d2df8dfff3c94bd45b76d31396b954696cf 100644
--- a/mail/mutt/files/patch-dgc-deepif
+++ b/mail/mutt/files/patch-dgc-deepif
@@ -1,6 +1,6 @@
---- muttlib.c.orig	2022-02-12 23:46:24 UTC
+--- muttlib.c.orig	2022-04-30 21:11:31 UTC
 +++ muttlib.c
-@@ -1724,6 +1724,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1737,6 +1737,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
  	count = 0;
          while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&')
  	{
@@ -13,7 +13,7 @@
            *cp++ = *src++;
  	  count++;
  	}
-@@ -1736,7 +1742,13 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1749,7 +1755,13 @@ void mutt_FormatString (char *dest,		/* output buffer 
  	count = 0;
  	while (count < sizeof (elsestring) && *src && *src != '?')
  	{