diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-01-22 14:00:29 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-01-22 14:00:29 -0300 |
commit | b07cea9374b9eb382fc18897bbb3df31efd54bb7 (patch) | |
tree | d417379ebc82fd5fda41e54d529caecfc6ab5925 /src/leap/mail/smtp/gateway.py | |
parent | e234531dc99bf3856343aa1666cf1ae00763610f (diff) | |
parent | 9347da67f253a697f5a1c3bd380263f61c62abed (diff) |
Merge remote-tracking branch 'refs/remotes/drebs/bug/5014_fix-attachment-processing-when-signing' into develop
Diffstat (limited to 'src/leap/mail/smtp/gateway.py')
-rw-r--r-- | src/leap/mail/smtp/gateway.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/leap/mail/smtp/gateway.py b/src/leap/mail/smtp/gateway.py index bef5c6d..ef398d1 100644 --- a/src/leap/mail/smtp/gateway.py +++ b/src/leap/mail/smtp/gateway.py @@ -600,13 +600,16 @@ class EncryptedMessage(object): self._msg = self._origmsg return - # add a nice footer to the outgoing message from_address = validate_address(self._fromAddress.addrstr) username, domain = from_address.split('@') - self.lines.append('--') - self.lines.append('%s - https://%s/key/%s' % - (self.FOOTER_STRING, domain, username)) - self.lines.append('') + + # add a nice footer to the outgoing message + if self._origmsg.get_content_type() == 'text/plain': + self.lines.append('--') + self.lines.append('%s - https://%s/key/%s' % + (self.FOOTER_STRING, domain, username)) + self.lines.append('') + self._origmsg = self.parseMessage() # get sender and recipient data |