X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;fp=lib-mime%2Frfc822parse.c;h=1bafc6b3e60655c860228bbcb7cf87650ab9d879;hp=9c43c9d0406b29483d98753d22b70342f14e0fea;hb=129050c6742f6be13fa5635ba03542b7fb2a9525;hpb=8e075eda08c6f099ec6988e16607fb4f6a10ba92;ds=sidebyside

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index 9c43c9d..1bafc6b 100644
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -957,7 +957,7 @@ string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha
         /* restore the original line */
         line[m_strlen(line)] = ':';
 
-        if (weed && option(OPTWEED) && mutt_matches_ignore(line, Ignore)
+        if (weed && mutt_matches_ignore(line, Ignore)
         && !mutt_matches_ignore(line, UnIgnore)) {
             break;
         }
@@ -1147,9 +1147,6 @@ static int count_body_parts (BODY *body, int flags)
 
 int mutt_count_body_parts(HEADER *hdr, int flags)
 {
-    if (!option(OPTCOUNTATTACH))
-        return 0;
-
     if (hdr->attach_valid && !(flags & M_PARTS_RECOUNT))
         return hdr->attach_total;