X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=sendlib.c;h=328aa2b59889f63269b8d27fe0478c90e5c861ee;hb=576172ff50f9dd94dd2f5cc91d247c1e50dbe7fc;hp=e45ad112fbbee4c8cf0187a678731dfe5c4f981d;hpb=2bc76f88e99c16e773c2b2ba805a0bf3e2c034fd;p=apps%2Fmadmutt.git

diff --git a/sendlib.c b/sendlib.c
index e45ad11..328aa2b 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -18,10 +18,9 @@
 #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"
@@ -1107,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);
@@ -1977,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);
 }