1.1 --- a/imiptools/__init__.py Sun Feb 01 17:03:31 2015 +0100
1.2 +++ b/imiptools/__init__.py Sun Feb 01 18:26:21 2015 +0100
1.3 @@ -99,25 +99,29 @@
1.4 # Pack any returned parts into messages.
1.5
1.6 if all_responses:
1.7 - outgoing_parts = []
1.8 + outgoing_parts = {}
1.9 forwarded_parts = []
1.10
1.11 - for outgoing, part in all_responses:
1.12 - if outgoing:
1.13 - outgoing_parts.append(part)
1.14 + for outgoing_recipients, part in all_responses:
1.15 + if outgoing_recipients:
1.16 + for outgoing_recipient in outgoing_recipients:
1.17 + if not outgoing_parts.has_key(outgoing_recipient):
1.18 + outgoing_parts[outgoing_recipient] = []
1.19 + outgoing_parts[outgoing_recipient].append(part)
1.20 else:
1.21 forwarded_parts.append(part)
1.22
1.23 # Reply using any outgoing parts in a new message.
1.24
1.25 if outgoing_parts:
1.26 - message = self.messenger.make_outgoing_message(outgoing_parts, senders)
1.27 + for outgoing_recipient, parts in outgoing_parts.items():
1.28 + message = self.messenger.make_outgoing_message(parts, [outgoing_recipient])
1.29
1.30 - if "-d" in sys.argv:
1.31 - print >>sys.stderr, "Outgoing parts..."
1.32 - print message
1.33 - else:
1.34 - self.messenger.sendmail(senders, message.as_string())
1.35 + if "-d" in sys.argv:
1.36 + print >>sys.stderr, "Outgoing parts for %s..." % outgoing_recipient
1.37 + print message
1.38 + else:
1.39 + self.messenger.sendmail([outgoing_recipient], message.as_string())
1.40
1.41 # Forward messages to their recipients either wrapping the existing
1.42 # message, accompanying it or replacing it.