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

diff --git a/sendlib.c b/sendlib.c
index ad29311..a81949c 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -27,10 +27,7 @@
 #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>
@@ -1980,12 +1977,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);
 }