diff --git a/bindings/group.go b/bindings/group.go
index cc44791c0f64660dbe1a374eafc5f22f65c88880..335b062dc1e13e88cb3f3cc258c8507ceacc356b 100644
--- a/bindings/group.go
+++ b/bindings/group.go
@@ -63,7 +63,8 @@ func NewGroupManager(client *Client, requestFunc GroupRequestFunc,
 // MakeGroup creates a new group and sends a group request to all members in the
 // group. The ID of the new group, the rounds the requests were sent on, and the
 // status of the send are contained in NewGroupReport.
-func (g *GroupChat) MakeGroup(membership *IdList, name, message []byte) (*NewGroupReport, error) {
+func (g *GroupChat) MakeGroup(membership *IdList, name, message []byte) (
+	*NewGroupReport, error) {
 	grp, rounds, status, err := g.m.MakeGroup(membership.list, name, message)
 	return &NewGroupReport{&Group{grp}, rounds, status}, err
 }
diff --git a/groupChat/receive.go b/groupChat/receive.go
index 78e448c3fccec9456f52cccf7ad3629096988432..a708a83becd4d1d33fd8dddf459d0562852e5fd1 100644
--- a/groupChat/receive.go
+++ b/groupChat/receive.go
@@ -60,9 +60,9 @@ func (m Manager) receive(rawMsgs chan message.Receive, stop *stoppable.Single) {
 				SenderID:       senderID,
 				RecipientID:    receiveMsg.RecipientID,
 				EphemeralID:    receiveMsg.EphemeralID,
-				Timestamp:      receiveMsg.Timestamp,
+				Timestamp:      timestamp,
 				RoundID:        receiveMsg.RoundId,
-				RoundTimestamp: timestamp,
+				RoundTimestamp: receiveMsg.RoundTimestamp,
 			})
 		}
 	}
diff --git a/groupChat/receive_test.go b/groupChat/receive_test.go
index 26f3a680065095d05a6c2725e35be7862d8827be..125e34815ee64282df2a546e1a3e001c575ea266 100644
--- a/groupChat/receive_test.go
+++ b/groupChat/receive_test.go
@@ -42,7 +42,8 @@ func TestManager_receive(t *testing.T) {
 		ID:             group.MessageID{0, 1, 2, 3},
 		Payload:        contents,
 		SenderID:       sender.ID,
-		RoundTimestamp: timestamp.Local(),
+		Timestamp:      timestamp.Local(),
+		RoundTimestamp: timestamp,
 	}
 
 	// Create cMix message and get public message
@@ -51,11 +52,11 @@ func TestManager_receive(t *testing.T) {
 		t.Errorf("Failed to create new cMix message: %+v", err)
 	}
 
-	internalMsg, _ := newInternalMsg(cMixMsg.ContentsSize() - publicMinLen)
-	internalMsg.SetTimestamp(timestamp)
-	internalMsg.SetSenderID(m.gs.GetUser().ID)
-	internalMsg.SetPayload(contents)
-	expectedMsg.ID = group.NewMessageID(g.ID, internalMsg.Marshal())
+	intlMsg, _ := newInternalMsg(cMixMsg.ContentsSize() - publicMinLen)
+	intlMsg.SetTimestamp(timestamp)
+	intlMsg.SetSenderID(m.gs.GetUser().ID)
+	intlMsg.SetPayload(contents)
+	expectedMsg.ID = group.NewMessageID(g.ID, intlMsg.Marshal())
 
 	receiveChan := make(chan message.Receive, 1)
 	stop := stoppable.NewSingle("singleStoppable")