diff options
| -rw-r--r-- | docs/changelog.rst | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/mail/outgoing/service.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst index d197eded..99821b44 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -13,6 +13,7 @@ Features Bugfixes ~~~~~~~~ - `#9099 <https://0xacab.org/leap/bitmask-dev/issues/9099>`_: properly check for openvpn binary path in bundles. +- `#9064 <https://0xacab.org/leap/bitmask-dev/issues/9064>`_: keep content-type when it is set in message headers. - Ship cacert.pem inside Bitmask.app - Avoid importing linux-specific constants in firewall helpers. diff --git a/src/leap/bitmask/mail/outgoing/service.py b/src/leap/bitmask/mail/outgoing/service.py index 86fb63c2..18d266ef 100644 --- a/src/leap/bitmask/mail/outgoing/service.py +++ b/src/leap/bitmask/mail/outgoing/service.py @@ -342,7 +342,8 @@ class OutgoingMail(object): msg = MIMEMultipart() for h, v in origmsg.items(): msg.add_header(h, v) - msg.attach(MIMEText(origmsg.get_payload())) + msg.attach(MIMEText(origmsg.get_payload(decode=True), + origmsg.get_content_subtype())) keymsg = MIMEApplication(from_key.key_data, _subtype='pgp-keys', _encoder=lambda x: x) |