X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fhdrline.c;h=c0cef6d3f2f87eb170716182307bf88c47b84d1a;hb=6c248aa3490f9c948da1bcfe49bdf8d7ba25e372;hp=50049ef39315b71ded549db98812313cd8ffea6f;hpb=576172ff50f9dd94dd2f5cc91d247c1e50dbe7fc;p=apps%2Fmadmutt.git

diff --git a/lib-ui/hdrline.c b/lib-ui/hdrline.c
index 50049ef..c0cef6d 100644
--- a/lib-ui/hdrline.c
+++ b/lib-ui/hdrline.c
@@ -7,10 +7,9 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <lib-lib/lib-lib.h>
+#include <lib-ui/lib-ui.h>
 
 #include <lib-mime/mime.h>
-#include <lib-ui/curses.h>
 #include <lib-mx/mx.h>
 
 #include "mutt.h"
@@ -498,7 +497,7 @@ hdr_format_str(char *dest, ssize_t destlen,
   case 'O':
     if (!optional) {
       make_from_addr (hdr->env, buf2, sizeof (buf2), 1);
-      if (!option (OPTSAVEADDRESS) && (p = strpbrk (buf2, "%@")))
+      if ((p = strpbrk (buf2, "%@")))
         *p = 0;
       mutt_format_s (dest, destlen, prefix, buf2);
     }
@@ -756,5 +755,5 @@ _mutt_make_string (char *dest, ssize_t destlen, const char *s, CONTEXT * ctx,
   hfi.hdr = hdr;
   hfi.ctx = ctx;
 
-  m_strformat(dest, destlen, COLS - SW, s, hdr_format_str, &hfi, flags);
+  m_strformat(dest, destlen, getmaxx(main_w), s, hdr_format_str, &hfi, flags);
 }