X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=399a65bd19dc299e81c6b72fcc740d2a5ac85a12;hp=565fcb0d710ddc4656385d9d49a47e48e248d072;hb=a743b55a20cbf3a33699fdb24dcb8638e878cc46;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/copy.c b/copy.c
index 565fcb0..399a65b 100644
--- a/copy.c
+++ b/copy.c
@@ -23,7 +23,6 @@
 #include "handler.h"
 #include "mx.h"
 #include "copy.h"
-#include "rfc2047.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
@@ -356,7 +355,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
     fputs ("Content-Type: text/plain; charset=", out);
     mutt_canonical_charset (chsbuf, sizeof (chsbuf),
                             Charset ? Charset : "us-ascii");
-    rfc822_cat (buffer, sizeof (buffer), chsbuf, MimeSpecials);
+    rfc822_strcpy(buffer, sizeof(buffer), chsbuf, MimeSpecials);
     fputs (buffer, out);
     fputc ('\n', out);
 
@@ -940,7 +939,7 @@ static int address_header_decode (char **h)
 
   format_address_header (h, a);
 
-  rfc822_free_address (&a);
+  address_delete (&a);
 
   p_delete(&s);
   return 1;