X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=c5035431ae290ed5c34d970e6fd4c4d6cf993cdd;hp=afcc9b1cdfb9e16ff49e08e7de611bed7cdcb2f4;hb=ab08a35e6e38e50a8d525209db872ade970ae5be;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1

diff --git a/postpone.c b/postpone.c
index afcc9b1..c503543 100644
--- a/postpone.c
+++ b/postpone.c
@@ -29,11 +29,10 @@
 #include "sort.h"
 #include "thread.h"
 #include "mx.h"
-#ifdef USE_IMAP
-#include "imap.h"
-#include "imap/mx_imap.h"
-#endif
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
+
+#include <imap/imap.h>
+#include <imap/mx_imap.h>
 
 #include "lib/debug.h"
 
@@ -82,7 +81,6 @@ int mutt_num_postponed (int force)
   if (!Postponed)
     return 0;
 
-#ifdef USE_IMAP
   /* LastModify is useless for IMAP */
   if (imap_is_magic (Postponed, NULL) == M_IMAP) {
     if (force) {
@@ -98,7 +96,6 @@ int mutt_num_postponed (int force)
     }
     return PostCount;
   }
-#endif
 
   if (stat (Postponed, &st) == -1) {
     PostCount = 0;
@@ -544,7 +541,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
         || b == NULL) {
     err:
       mx_close_message (&msg);
-      mutt_free_envelope (&newhdr->env);
+      envelope_delete(&newhdr->env);
       mutt_free_body (&newhdr->content);
       mutt_error _("Decryption failed.");
 
@@ -682,7 +679,7 @@ bail:
     mx_close_message (&msg);
 
   if (rv == -1) {
-    mutt_free_envelope (&newhdr->env);
+    envelope_delete(&newhdr->env);
     mutt_free_body (&newhdr->content);
   }