# include "config.h"
#endif
+#include <string.h>
+#include <unistd.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/file.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
+
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "mx.h"
#include "pop.h"
#include <lib-crypt/crypt.h>
-#include "mutt_curses.h"
-
-#include "lib/debug.h"
-
-#include <string.h>
-#include <unistd.h>
/* write line to file */
static int fetch_message (char *line, void *file)