Merge pull request #209 from xmtp/coda/switch-to-client-timestamp

Merge pull request #209 from xmtp/coda/switch-to-client-timestamp #804