--- email2trac.py.in    Tue May  1 11:30:57 2007
@@ -78,6 +78,7 @@
 import string
 import getopt
 import stat
+from datetime import tzinfo, timedelta, datetime
 import time
 import email
 import email.Iterators
@@ -97,6 +98,25 @@
 trac_default_version = 0.10
 m = None

+ZERO = timedelta(0)
+HOUR = timedelta(hours=1)
+
+# A UTC class.
+
+class UTC(tzinfo):
+    """UTC"""
+
+    def utcoffset(self, dt):
+        return ZERO
+
+    def tzname(self, dt):
+        return "UTC"
+
+    def dst(self, dt):
+        return ZERO
+
+utc = UTC()
+

 class TicketEmailParser(object):
        env = None
@@ -401,7 +421,8 @@

                # Get current time
                #
-               when = int(time.time())
+               # when = int(time.time())
+               when = datetime.now(utc)

                if self.VERSION  == 0.8:
                        tkt = Ticket(self.db, ticket_id)