X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fhdrline.c;h=09e77da8e6a27fb81d3b8ae63393760fad6f16c3;hb=2bffc6c0ec2984441f8f66e23af8d3215f7a6f84;hp=1b3f10a7b461dd44a5d18dcf3783031ca3462dbd;hpb=98cf5779d8184a74541be1bc61d15c5f35efd310;p=apps%2Fmadmutt.git

diff --git a/lib-ui/hdrline.c b/lib-ui/hdrline.c
index 1b3f10a..09e77da 100644
--- a/lib-ui/hdrline.c
+++ b/lib-ui/hdrline.c
@@ -10,8 +10,8 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "alias.h"
@@ -20,7 +20,6 @@
 #include "charset.h"
 #include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
-#include "mx.h"
 
 int mutt_is_mail_list (address_t * addr)
 {
@@ -223,7 +222,7 @@ static const char *hdr_format_str (char *dest,
   struct hdr_format_info *hfi = (struct hdr_format_info *) data;
   HEADER *hdr, *htmp;
   CONTEXT *ctx;
-  char fmt[SHORT_STRING], buf2[SHORT_STRING], ch, *p;
+  char fmt[STRING], buf2[STRING], ch, *p;
   int do_locales, i;
   int optional = (flags & M_FORMAT_OPTIONAL);
   int threads = ((Sort & SORT_MASK) == SORT_THREADS);
@@ -396,7 +395,7 @@ static const char *hdr_format_str (char *dest,
 
   case 'f':
     buf2[0] = 0;
-    rfc822_write_address (buf2, sizeof (buf2), hdr->env->from, 1);
+    rfc822_addrcat(buf2, sizeof (buf2), hdr->env->from, 1);
     mutt_format_s (dest, destlen, prefix, buf2);
     break;
 
@@ -439,7 +438,7 @@ static const char *hdr_format_str (char *dest,
       int j = 0;
 
       for (i = 0; hdr->env->from && hdr->env->from->personal &&
-           hdr->env->from->personal[i] && j < SHORT_STRING - 1; i++) {
+           hdr->env->from->personal[i] && j < STRING - 1; i++) {
         if (isalpha ((int) hdr->env->from->personal[i])) {
           if (!iflag) {
             buf2[j++] = hdr->env->from->personal[i];
@@ -629,12 +628,6 @@ static const char *hdr_format_str (char *dest,
     {
       int count = 0;
 
-      if (option (OPTCOUNTATTACH)) {
-        if (!hdr->content->parts)
-          mutt_parse_mime_message(ctx, hdr);
-        count = mutt_count_body_parts(hdr, 0);
-      }
-
       /* The recursion allows messages without depth to return 0. */
       if (optional)
         optional = count != 0;