X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=83604ca465dad2fd3a0af4f1fc41626fd7f2e0c5;hp=58eaaa54395691f7220a8fd0e6085ee74d2d2acb;hb=d5fc962299f48696697e29f323e78c8bba6ca2d1;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1

diff --git a/commands.c b/commands.c
index 58eaaa5..83604ca 100644
--- a/commands.c
+++ b/commands.c
@@ -28,16 +28,14 @@
 #include "copy.h"
 #include "mx.h"
 #include "pager.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 #include "rfc1524.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
+#include <imap/imap.h>
 
 #ifdef BUFFY_SIZE
 #include "buffy.h"
@@ -754,7 +752,6 @@ int mutt_save_message (HEADER * h, int delete,
 
   mutt_message (_("Copying to %s..."), buf);
 
-#ifdef USE_IMAP
   if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) {
     switch (imap_copy_messages (Context, h, buf, delete)) {
       /* success */
@@ -769,7 +766,6 @@ int mutt_save_message (HEADER * h, int delete,
       return -1;
     }
   }
-#endif
 
   if (mx_open_mailbox (buf, M_APPEND, &ctx) != NULL) {
     if (h) {