X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=5545a8f550a1eaca706012de06a1e3507349a056;hp=30434af45e8a6cefacbacc64f454b8312e1abccc;hb=f68ede9bdd47d8c705245b2a07c0b8ba1e230662;hpb=9946738a6a1c27a5602a14d1afe2eea2389732b2

diff --git a/handler.c b/handler.c
index 30434af..5545a8f 100644
--- a/handler.c
+++ b/handler.c
@@ -12,7 +12,7 @@
 #include <lib-mime/mime.h>
 #include <lib-mime/rfc3676.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 
 #include <lib-sys/unix.h>
 
@@ -1027,8 +1027,7 @@ static int multipart_handler (BODY * a, STATE * s)
     }
     rc = mutt_body_handler (p, s);
     state_putc ('\n', s);
-    if (rc || ((s->flags & M_REPLYING)
-        && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE)))
+    if (rc)
       break;
   }
 
@@ -1438,7 +1437,6 @@ int mutt_body_handler (BODY * b, STATE * s)
         s->fpin = fp;
       }
     }
-    s->flags |= M_FIRSTDONE;
   }
   else if (s->flags & M_DISPLAY) {
     state_mark_attach (s);
@@ -1455,7 +1453,6 @@ int mutt_body_handler (BODY * b, STATE * s)
   }
 
 bail:
-  s->flags = oflags | (s->flags & M_FIRSTDONE);
-
+  s->flags = oflags;
   return (rc);
 }