X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=328aa2b59889f63269b8d27fe0478c90e5c861ee;hp=ad29311c6ecfdff05852582ca4bfdfa6dde261e6;hb=569145d4875fd59719a1a3a7d2c7d64d622eacd1;hpb=92c3d4c767ddbc0e0c64dd6e132ce10627550580

diff --git a/sendlib.c b/sendlib.c
index ad29311..328aa2b 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -18,19 +18,15 @@
 #include <lib-ui/curses.h>
 #include <lib-mx/mx.h>
 
-#include <lib-crypt/crypt.h>
-
 #include "mutt.h"
 #include "handler.h"
+#include "crypt.h"
 #include "recvattach.h"
 #include "copy.h"
 #include "pager.h"
 #include "charset.h"
 #include "mutt_idna.h"
-
-#ifdef USE_LIBESMTP
-# include "mutt_libesmtp.h"
-#endif /* USE_LIBESMTP */
+#include "mutt_libesmtp.h"
 
 #ifdef USE_NNTP
 #include <nntp/nntp.h>
@@ -1110,8 +1106,6 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg)
 
   if ((option (OPTMIMEFORWDECODE) || option (OPTFORWDECRYPT)) &&
       (hdr->security & ENCRYPT)) {
-    if (!crypt_valid_passphrase (hdr->security))
-      return (NULL);
   }
 
   fp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
@@ -1980,12 +1974,7 @@ void mutt_prepare_envelope (ENVELOPE * env, int final)
   rfc2047_encode_adrlist(env->reply_to, "Reply-To");
 
   if (env->subject)
-#ifdef USE_NNTP
-    if (!option (OPTNEWSSEND) || option (OPTMIMESUBJECT))
-#endif
-    {
-      rfc2047_encode_string (&env->subject);
-    }
+    rfc2047_encode_string (&env->subject);
   encode_headers (env->userhdrs);
 }