diff --git a/fileTransfer/receive_test.go b/fileTransfer/receive_test.go
index 4ea9419b8b96e2125da246d71a216303e3bb0643..cc28fc24f1b910128ceba15d1486b1ef9e120966 100644
--- a/fileTransfer/receive_test.go
+++ b/fileTransfer/receive_test.go
@@ -97,7 +97,7 @@ func TestManager_receive(t *testing.T) {
 	if err != nil {
 		t.Errorf("Failed to get sent transfer %s: %+v", stID, err)
 	}
-	cMixMsg, err := m1.newCmixMessage(st, 0, prng)
+	cMixMsg, err := m1.newCmixMessage(st, 0)
 	if err != nil {
 		t.Errorf("Failed to create new cMix message: %+v", err)
 	}
@@ -203,7 +203,7 @@ func TestManager_receive_Stop(t *testing.T) {
 	if err != nil {
 		t.Errorf("Failed to get sent transfer %s: %+v", stID, err)
 	}
-	cMixMsg, err := m1.newCmixMessage(st, 0, prng)
+	cMixMsg, err := m1.newCmixMessage(st, 0)
 	if err != nil {
 		t.Errorf("Failed to create new cMix message: %+v", err)
 	}
@@ -311,7 +311,7 @@ func TestManager_readMessage(t *testing.T) {
 	if err != nil {
 		t.Errorf("Failed to get sent transfer %s: %+v", stID, err)
 	}
-	cMixMsg, err := m1.newCmixMessage(st, 0, prng)
+	cMixMsg, err := m1.newCmixMessage(st, 0)
 	if err != nil {
 		t.Errorf("Failed to create new cMix message: %+v", err)
 	}
diff --git a/fileTransfer/send.go b/fileTransfer/send.go
index 0ae1bdfae8e58456395d4cc5cbc300fd13f7040a..875e01890fba131b0acc1273b388158ea3c06698 100644
--- a/fileTransfer/send.go
+++ b/fileTransfer/send.go
@@ -324,7 +324,7 @@ func (m *Manager) buildMessages(partList []queuedPart) (
 		}
 
 		// Generate new cMix message with encrypted file part
-		cmixMsg, err := m.newCmixMessage(st, part.partNum, rng)
+		cmixMsg, err := m.newCmixMessage(st, part.partNum)
 		if err == ftStorage.MaxRetriesErr {
 			jww.DEBUG.Printf("[FT] File transfer %s sent to %s ran out of "+
 				"retries {parts: %d, numFps: %d/%d}",
@@ -361,7 +361,7 @@ func (m *Manager) buildMessages(partList []queuedPart) (
 // newCmixMessage creates a new cMix message with an encrypted file part, its
 // MAC, and fingerprint.
 func (m *Manager) newCmixMessage(transfer *ftStorage.SentTransfer,
-	partNum uint16, rng csprng.Source) (format.Message, error) {
+	partNum uint16) (format.Message, error) {
 	// Create new empty cMix message
 	cmixMsg := format.NewMessage(m.store.Cmix().GetGroup().GetP().ByteLen())
 
diff --git a/fileTransfer/send_test.go b/fileTransfer/send_test.go
index 2e3d3d16d8325be32ba975decb14b3af41f57636..d35e418b8efb80f7a1107d90370a1e7a23706687 100644
--- a/fileTransfer/send_test.go
+++ b/fileTransfer/send_test.go
@@ -650,7 +650,7 @@ func TestManager_newCmixMessage(t *testing.T) {
 		t.Errorf("Failed to create a new SentTransfer: %+v", err)
 	}
 
-	cmixMsg, err := m.newCmixMessage(transfer, 0, prng)
+	cmixMsg, err := m.newCmixMessage(transfer, 0)
 	if err != nil {
 		t.Errorf("newCmixMessage returned an error: %+v", err)
 	}
@@ -663,7 +663,7 @@ func TestManager_newCmixMessage(t *testing.T) {
 	}
 
 	decrPart, err := ftCrypto.DecryptPart(key, cmixMsg.GetContents(),
-		 cmixMsg.GetMac(), 0,cmixMsg.GetKeyFP())
+		cmixMsg.GetMac(), 0, cmixMsg.GetKeyFP())
 	if err != nil {
 		t.Errorf("Failed to decrypt file part: %+v", err)
 	}
@@ -1007,7 +1007,7 @@ func TestManager_getPartSize(t *testing.T) {
 	primeByteLen := m.store.Cmix().GetGroup().GetP().ByteLen()
 	cmixMsgUsedLen := format.AssociatedDataSize
 	filePartMsgUsedLen := ftStorage.FmMinSize
-	expected := 2*primeByteLen - cmixMsgUsedLen - filePartMsgUsedLen-1
+	expected := 2*primeByteLen - cmixMsgUsedLen - filePartMsgUsedLen - 1
 
 	// Get the part size
 	partSize, err := m.getPartSize()