1.1 --- a/imiptools/client.py	Fri Oct 16 00:11:25 2015 +0200
     1.2 +++ b/imiptools/client.py	Fri Oct 16 16:11:01 2015 +0200
     1.3 @@ -201,6 +201,16 @@
     1.4          if self.messenger and self.messenger.sender != get_address(self.user):
     1.5              attr["SENT-BY"] = get_uri(self.messenger.sender)
     1.6  
     1.7 +    def get_sending_attendee(self):
     1.8 +
     1.9 +        "Return the attendee who sent the current object."
    1.10 +
    1.11 +        calendar_uri = get_uri(config.MESSAGE_SENDER)
    1.12 +        for attendee, attendee_attr in uri_items(self.obj.get_items("ATTENDEE")):
    1.13 +            if attendee_attr.get("SENT-BY") == calendar_uri:
    1.14 +                return get_uri(attendee)
    1.15 +        return None
    1.16 +
    1.17      def get_periods(self, obj):
    1.18  
    1.19          """

     2.1 --- a/imiptools/handlers/person_outgoing.py	Fri Oct 16 00:11:25 2015 +0200
     2.2 +++ b/imiptools/handlers/person_outgoing.py	Fri Oct 16 16:11:01 2015 +0200
     2.3 @@ -21,8 +21,7 @@
     2.4  """
     2.5  
     2.6  from imiptools.client import Client
     2.7 -from imiptools.config import MESSAGE_SENDER
     2.8 -from imiptools.data import get_uri, uri_dict, uri_items, uri_values
     2.9 +from imiptools.data import get_uri, uri_dict, uri_values
    2.10  from imiptools.handlers import Handler
    2.11  from imiptools.handlers.common import CommonEvent
    2.12  
    2.13 @@ -50,10 +49,7 @@
    2.14              # chosen.
    2.15  
    2.16              else:
    2.17 -                calendar_uri = get_uri(MESSAGE_SENDER)
    2.18 -                for attendee, attendee_attr in uri_items(self.obj.get_items("ATTENDEE")):
    2.19 -                    if attendee_attr.get("SENT-BY") == calendar_uri:
    2.20 -                        self.user = get_uri(attendee)
    2.21 +                self.user = self.get_sending_attendee()
    2.22  
    2.23      def _add(self):
    2.24