X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=compose.c;h=91a2894f22067ca1426c6c103dd2d606b5b04125;hb=fd89c927c5192e12ac36d9388b5cd9fb55dc870d;hp=6ecac7f6105be7b1bfedacb15e5f2e055aa1d2a0;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1;p=apps%2Fmadmutt.git

diff --git a/compose.c b/compose.c
index 6ecac7f..91a2894 100644
--- a/compose.c
+++ b/compose.c
@@ -19,6 +19,9 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -26,10 +29,8 @@
 #include "mutt_idna.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
-#include "mime.h"
 #include "attach.h"
 #include "recvattach.h"
-#include "mapping.h"
 #include "sort.h"
 #include "charset.h"
 #include "mx.h"
@@ -622,7 +623,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
             && buf[0]) {
           p_delete(&msg->env->newsgroups);
           str_skip_trailws (buf);
-          msg->env->newsgroups = m_strdup(str_skip_initws (buf));
+          msg->env->newsgroups = m_strdup(vskipspaces(buf));
           move (HDR_TO, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->newsgroups)
@@ -640,7 +641,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
             && buf[0]) {
           p_delete(&msg->env->followup_to);
           str_skip_trailws (buf);
-          msg->env->followup_to = m_strdup(str_skip_initws (buf));
+          msg->env->followup_to = m_strdup(vskipspaces(buf));
           move (HDR_CC, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->followup_to)