X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postpone.c;h=4a08b97f0c08cfd1fbbd62e95eecfc2e79d98231;hb=c76ab67f3430e67b14b381bc1e3a23a14a4053b8;hp=5fda6cec492ad0cd7ad99e5913c3017709a670da;hpb=8d429041536e4508e8dd00b390721895dc324b9b;p=apps%2Fmadmutt.git

diff --git a/postpone.c b/postpone.c
index 5fda6ce..4a08b97 100644
--- a/postpone.c
+++ b/postpone.c
@@ -343,8 +343,6 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       string_list_wipe(&tmp);
       tmp = next;
     }
-
-#ifdef MIXMASTER
     else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
       char *t;
 
@@ -365,8 +363,6 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       string_list_wipe(&tmp);
       tmp = next;
     }
-#endif
-
     else {
       last = tmp;
       tmp = tmp->next;
@@ -593,13 +589,10 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
     s.flags = 0;
 
     if (b->type == TYPETEXT) {
-      if (!ascii_strcasecmp
-          ("yes", parameter_getval(b->parameter, "x-mutt-noconv")))
-        b->noconv = 1;
-      else {
+      b->noconv = !ascii_strcasecmp("yes", parameter_getval(b->parameter,
+                                                            "x-mutt-noconv"));
+      if (b->noconv)
         s.flags |= M_CHARCONV;
-        b->noconv = 0;
-      }
 
       parameter_delval(&b->parameter, "x-mutt-noconv");
     }