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

diff -r e4aaf9fbd8b4 -r 73c5e5999c47 imiptools/client.py
--- a/imiptools/client.py	Fri Oct 06 01:05:30 2017 +0200
+++ b/imiptools/client.py	Fri Oct 06 19:35:56 2017 +0200
@@ -238,8 +238,11 @@
 
         "Update the SENT-BY attribute of the 'attr' sender metadata."
 
-        if self.messenger and self.messenger.sender != get_address(self.user):
-            attr["SENT-BY"] = get_uri(self.messenger.sender)
+        if self.messenger:
+            if self.messenger.sender != get_address(self.user):
+                attr["SENT-BY"] = get_uri(self.messenger.sender)
+            else:
+                del attr["SENT-BY"]
 
     def get_periods(self, obj, explicit_only=False, future_only=False):
 
diff -r e4aaf9fbd8b4 -r 73c5e5999c47 imiptools/dates.py
--- a/imiptools/dates.py	Fri Oct 06 01:05:30 2017 +0200
+++ b/imiptools/dates.py	Fri Oct 06 19:35:56 2017 +0200
@@ -453,8 +453,7 @@
 
     "Return the current time as an iCalendar-compatible string."
 
-    offset = offset or timedelta(0)
-    return format_datetime(to_timezone(datetime.utcnow(), "UTC") + offset)
+    return format_datetime(get_time(offset))
 
 def get_date(offset=None):