X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=7b4b9bc4da068f0cbf55f5e637929b7c66a1073f;hp=4ffad14dbc8676bd34a6563b614027c7a54c0428;hb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f;hpb=33d07d4040a973a004c4a729fd1f56a63a7203e6

diff --git a/send.c b/send.c
index 4ffad14..7b4b9bc 100644
--- a/send.c
+++ b/send.c
@@ -22,7 +22,6 @@
 #include "mutt.h"
 #include "enter.h"
 #include "mutt_curses.h"
-#include "rfc2047.h"
 #include "rfc3676.h"
 #include "keymap.h"
 #include "copy.h"
@@ -297,7 +296,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
 
     return (-1);
   }
-  str_replace (&en->subject, buf);
+  m_strreplace(&en->subject, buf);
 
   return 0;
 }
@@ -351,7 +350,7 @@ static void process_user_header (ENVELOPE * env)
       env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9);
     }
     else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0)
-      str_replace (&env->message_id, uh->data + 11);
+      m_strreplace(&env->message_id, uh->data + 11);
     else if (ascii_strncasecmp ("to:", uh->data, 3) != 0 &&
              ascii_strncasecmp ("cc:", uh->data, 3) != 0 &&
              ascii_strncasecmp ("bcc:", uh->data, 4) != 0 &&
@@ -634,7 +633,7 @@ void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur)
 
   /* set the default subject for the message. */
   mutt_make_string (buffer, sizeof (buffer), NONULL (ForwFmt), ctx, cur);
-  str_replace (&env->subject, buffer);
+  m_strreplace(&env->subject, buffer);
 }
 
 void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,