1.1 --- a/imiptools/mail.py Tue Oct 28 18:22:28 2014 +0100
1.2 +++ b/imiptools/mail.py Tue Oct 28 22:39:40 2014 +0100
1.3 @@ -13,14 +13,20 @@
1.4 This is a response to a calendar message sent by your calendar program.
1.5 """
1.6
1.7 +PREAMBLE_TEXT = """\
1.8 +This message contains several different parts, one of which will contain
1.9 +calendar information that will only be understood by a suitable program.
1.10 +"""
1.11 +
1.12 class Messenger:
1.13
1.14 "Sending of outgoing messages."
1.15
1.16 - def __init__(self, sender=None, subject=None, body_text=None):
1.17 + def __init__(self, sender=None, subject=None, body_text=None, preamble_text=None):
1.18 self.sender = sender or MESSAGE_SENDER
1.19 self.subject = subject or MESSAGE_SUBJECT
1.20 self.body_text = body_text or MESSAGE_TEXT
1.21 + self.preamble_text = preamble_text or PREAMBLE_TEXT
1.22
1.23 def sendmail(self, recipients, data, sender=None, lmtp_socket=None):
1.24
1.25 @@ -46,7 +52,7 @@
1.26 """
1.27
1.28 message = MIMEMultipart("mixed", _subparts=parts)
1.29 - message.preamble = self.body_text
1.30 + message.preamble = self.preamble_text
1.31 payload = message.get_payload()
1.32 payload.insert(0, MIMEText(self.body_text))
1.33
1.34 @@ -62,8 +68,10 @@
1.35 "Wrap 'msg' and provide the given 'parts' as the primary content."
1.36
1.37 message = MIMEMultipart("mixed", _subparts=parts)
1.38 - message.preamble = self.body_text
1.39 - message.get_payload().append(MIMEMessage(msg))
1.40 + message.preamble = self.preamble_text
1.41 + payload = message.get_payload()
1.42 + payload.insert(0, MIMEText(self.body_text))
1.43 + payload.append(MIMEMessage(msg))
1.44
1.45 message["From"] = msg["From"]
1.46 message["To"] = msg["To"]