#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
#include "mutt.h"
#include "enter.h"
#include "mime.h"
#include "attach.h"
#include "recvattach.h"
-#include "mapping.h"
#include "sort.h"
#include "charset.h"
#include "mx.h"
&& 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)
&& 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)