X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fhdrline.c;h=5bbff4a2dcbe7c82e76df5600fa1cec64ee9112d;hp=24aa3de632e637a2928fb27cd7b8be19de6d77dc;hb=88d239144bf6f50ca1eda6db7742281f0ad0f97f;hpb=4e1e9d0cf1a4efd6e9dc3be1666202a0481d8319

diff --git a/lib-ui/hdrline.c b/lib-ui/hdrline.c
index 24aa3de..5bbff4a 100644
--- a/lib-ui/hdrline.c
+++ b/lib-ui/hdrline.c
@@ -7,15 +7,14 @@
  * 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 <lib-crypt/crypt.h>
 
 #include "mutt.h"
 #include "alias.h"
+#include "crypt.h"
 #include "sort.h"
 #include "thread.h"
 #include "charset.h"
@@ -405,13 +404,6 @@ hdr_format_str(char *dest, ssize_t destlen,
       optional = 0;
     break;
 
-#ifdef USE_NNTP
-  case 'g':
-    mutt_format_s (dest, destlen, prefix,
-                   hdr->env->newsgroups ? hdr->env->newsgroups : "");
-    break;
-#endif
-
   case 'H':
     /* (Hormel) spam score */
     if (optional)
@@ -498,7 +490,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 +748,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);
 }