diff --git a/go/characters/incominglistener.go b/go/characters/incominglistener.go
index e8f62ab3..1d39bbd0 100644
--- a/go/characters/incominglistener.go
+++ b/go/characters/incominglistener.go
@@ -5,7 +5,6 @@ import (
 	"cwtch.im/ui/go/cwutil"
 	"cwtch.im/ui/go/gobjects"
 	"cwtch.im/ui/go/the"
-	"git.openprivacy.ca/openprivacy/libricochet-go/log"
 	"time"
 )
 
@@ -16,25 +15,25 @@ func IncomingListener(callback func(*gobjects.Message)) {
 
 	for {
 		e := q.Next()
-		log.Debugf("got event %s", e.EventType)
 
 		switch e.EventType {
-		case event.NewMessageFromPeer:
+		case event.NewMessageFromPeer://event.TimestampReceived, event.RemotePeer, event.Data
+			ts, _ := time.Parse(time.RFC3339Nano, e.Data[event.TimestampReceived])
 			callback(&gobjects.Message{
-				Handle:    e.Data["Onion"],
-				From:      e.Data["Onion"],
-				Message:   e.Data["Data"],
-				Image:     cwutil.RandomProfileImage(e.Data["Onion"]),
-				Timestamp: time.Now(),
+				Handle:    e.Data[event.RemotePeer],
+				From:      e.Data[event.RemotePeer],
+				Message:   e.Data[event.Data],
+				Image:     cwutil.RandomProfileImage(e.Data[event.RemotePeer]),
+				Timestamp: ts,
 			})
-		case event.NewMessageFromGroup:
-			log.Debugf("NewMessageFromGroup!")
+		case event.NewMessageFromGroup://event.TimestampReceived, event.TimestampSent, event.Data, event.GroupID, event.RemotePeer
+			ts, _ := time.Parse(time.RFC3339Nano, e.Data[event.TimestampReceived])
 			callback(&gobjects.Message{
-				Handle:    e.Data["GroupID"],
-				From:      e.Data["Onion"],
-				Message:   e.Data["Data"],
-				Image:     cwutil.RandomGroupImage(e.Data["GroupID"]),
-				Timestamp: time.Now(),
+				Handle:    e.Data[event.GroupID],
+				From:      e.Data[event.RemotePeer],
+				Message:   e.Data[event.Data],
+				Image:     cwutil.RandomGroupImage(e.Data[event.GroupID]),
+				Timestamp: ts,
 			})
 		}
 	}