# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1507324825 -7200
# Node ID ca4d7af17e195d5993bc0c2ab3be6b57f17e7d5a
# Parent  73c5e5999c471a15f609041057e29c12ebe03917# Parent  c7204b035e66a8e0206e5317c9d1d03f3ffcfdfa
Merged changes from the default branch.

diff -r 73c5e5999c47 -r ca4d7af17e19 imiptools/client.py
--- a/imiptools/client.py	Fri Oct 06 19:35:56 2017 +0200
+++ b/imiptools/client.py	Fri Oct 06 23:20:25 2017 +0200
@@ -241,7 +241,7 @@
         if self.messenger:
             if self.messenger.sender != get_address(self.user):
                 attr["SENT-BY"] = get_uri(self.messenger.sender)
-            else:
+            elif attr.has_key("SENT-BY"):
                 del attr["SENT-BY"]
 
     def get_periods(self, obj, explicit_only=False, future_only=False):