* 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"
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)
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);
}
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);
}