X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fcrypt.c;h=f8cf4716a0c2c206a88398f2228b242326c6d10e;hp=99728dc2332c83221aef3097efe065c6bb7d4edd;hb=923e295d2cd179be0ab05890c9788bb822b1b340;hpb=2bc76f88e99c16e773c2b2ba805a0bf3e2c034fd

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 99728dc..f8cf471 100644
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -299,9 +299,9 @@ void convert_to_7bit (BODY * a)
       if (a->encoding != ENC7BIT) {
         a->encoding = ENC7BIT;
         convert_to_7bit (a->parts);
-      }
-      else if (option (OPTPGPSTRICTENC))
+      } else {
         convert_to_7bit (a->parts);
+      }
     }
     else if (a->type == TYPEMESSAGE &&
              m_strcasecmp(a->subtype, "delivery-status")) {
@@ -313,8 +313,7 @@ void convert_to_7bit (BODY * a)
     else if (a->encoding == ENCBINARY)
       a->encoding = ENCBASE64;
     else if (a->content && a->encoding != ENCBASE64 &&
-             (a->content->from || (a->content->space &&
-                                   option (OPTPGPSTRICTENC))))
+             (a->content->from || a->content->space))
       a->encoding = ENCQUOTEDPRINTABLE;
     a = a->next;
   }