X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=fd338e5be3e3c7f04d442d7954999beabba9b16e;hp=d37f0439fa6211fa1c72d292f8094325834cc1fb;hb=ab12fea9d01b3b9bc53081ae4ccc046243f1cb9f;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/postpone.c b/postpone.c
index d37f043..fd338e5 100644
--- a/postpone.c
+++ b/postpone.c
@@ -17,14 +17,15 @@
 #include <lib-lib/ascii.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"
 #include "handler.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
-#include "mime.h"
-#include "mapping.h"
 #include "sort.h"
 #include "thread.h"
 #include "mx.h"
@@ -298,8 +299,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       if (ctx) {
         /* if a mailbox is currently open, look to see if the orignal message
            the user attempted to reply to is in this mailbox */
-        p = tmp->data + 18;
-        SKIPWS (p);
+        p = vskipspaces(tmp->data + 18);
         if (!ctx->id_hash)
           ctx->id_hash = mutt_make_id_hash (ctx);
         *cur = hash_find (ctx->id_hash, p);
@@ -318,8 +318,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
         code |= SENDREPLY;
     }
     else if (ascii_strncasecmp ("X-Mutt-Fcc:", tmp->data, 11) == 0) {
-      p = tmp->data + 11;
-      SKIPWS (p);
+      p = vskipspaces(tmp->data + 11);
       m_strcpy(fcc, fcclen, p);
       mutt_pretty_mailbox (fcc);
 
@@ -409,8 +408,7 @@ int mutt_parse_crypt_hdr (char *p, int set_signas)
   if (!WithCrypto)
     return 0;
 
-  SKIPWS (p);
-  for (; *p; p++) {
+  for (p = vskipspaces(p); *p; p++) {
 
     switch (*p) {
     case 'e':