diff --git a/gpgmymail b/gpgmymail
index aa1c05e..e538e13 100755
--- a/gpgmymail
+++ b/gpgmymail
@@ -88,12 +88,12 @@ def decode_email(message: email.message.Message) -> email.message.Message:
     if message.is_multipart():
         for part in message.walk():
             if part.get('Content-Transfer-Encoding') in ('quoted-printable', 'base64'):
-                part.set_payload(part.get_payload(decode=True))
                 set_email_header(part, 'Content-Transfer-Encoding', '7bit')
+                part.set_payload(part.get_payload(decode=True))
     else:
         if message.get('Content-Transfer-Encoding') in ('quoted-printable', 'base64'):
-            message.set_payload(message.get_payload(decode=True))
             set_email_header(message, 'Content-Transfer-Encoding', '7bit')
+            message.set_payload(message.get_payload(decode=True))
 
     return message