--- a/annot-server/baseserver.py	Fri Apr 17 15:03:56 2015 +0200
+++ b/annot-server/baseserver.py	Fri Apr 17 15:20:46 2015 +0200
@@ -25,7 +25,8 @@
     """
     def process_annotation(self, params):
 
-        ts = params.setdefault('ts', datetime.datetime.now(tzutc()))
+        now = datetime.datetime.now(tzutc())
+        ts = params.setdefault('ts', now)
         if ts.tzinfo is None:
             ts = ts.replace(tzinfo=tzutc())
             params['ts'] = ts
@@ -33,6 +34,7 @@
 
         params_broadcast = copy.copy(params)
         params_broadcast.update({ 'ts' : ts.isoformat() })
+        params_broadcast['ts_server'] = now.isoformat()
         params_broadcast['uuid'] = str(params_broadcast['uuid'])
 
         #broadcast to websocket