diff --git a/crypto.go b/crypto.go
index 8fc355d..78d0e95 100644
--- a/crypto.go
+++ b/crypto.go
@@ -114,9 +114,8 @@ func EncryptAndSign(v Message, key *rsa.PrivateKey, pub *rsa.PublicKey, signatur
 
 	encBody := make([]byte, len(body))
 	enc := cipher2.NewCBCEncrypter(cipher, iv)
+	body = append(body, Pad(body)...)
 	enc.CryptBlocks(encBody, body)
-
-	copy(encBody[len(encBody):], Pad(encBody))
 	writer.Write([]byte(hex.EncodeToString(encBody)))
 
 	return nil