#include <lib-lib/macros.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+
#include <pop/pop.h>
#include "mutt.h"
-#include "mutt_curses.h"
#include "mx.h"
#include "mutt_menu.h"
#include "sort.h"
#include <lib-crypt/crypt.h>
#ifdef USE_NNTP
-#include "nntp.h"
+#include "nntp/nntp.h"
#endif
#ifdef USE_SASL
CHECK_MSGCOUNT;
if (Context->magic == M_NNTP) {
HEADER *h;
- int old = CURHDR->index, i;
+ int old = CURHDR->index;
if (!CURHDR->env->message_id) {
mutt_error (_("No Message-ID. Unable to perform operation"));