X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc2231.c;h=287c1d6d38a76cd9ff2b6cc876d2e5720abe3c4b;hp=24f8ba2aef3cf0487f642b5b30768a6d1be8ad4e;hb=07ccefd6c97ddd433d8432f7b4596a5572e09b48;hpb=8e075eda08c6f099ec6988e16607fb4f6a10ba92

diff --git a/lib-mime/rfc2231.c b/lib-mime/rfc2231.c
index 24f8ba2..287c1d6 100644
--- a/lib-mime/rfc2231.c
+++ b/lib-mime/rfc2231.c
@@ -175,7 +175,7 @@ rfc2231_join_continuations(parameter_t **head, rfc2231_param *par)
             vl = m_strlen(par->value);
 
             p_realloc(&value, l + vl + 1);
-            strcpy (value + l, par->value);   /* __STRCPY_CHECKED__ */
+            m_strcpy(value + l, vl + 1, par->value);
             l += vl;
 
             q = par->next;
@@ -233,7 +233,7 @@ void rfc2231_decode_parameters (parameter_t ** headp)
              * Internet Gateways.  So we actually decode it.
              */
 
-            if (option(OPTRFC2047PARAMS) && p->value && strstr(p->value, "=?")) {
+            if (p->value && strstr(p->value, "=?")) {
                 rfc2047_decode(&p->value);
             } else {
                 if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII)