diff --git a/Lidgren.Network/Encryption/NetBlockEncryptionBase.cs b/Lidgren.Network/Encryption/NetBlockEncryptionBase.cs
index 0506fb1..07a0443 100644
--- a/Lidgren.Network/Encryption/NetBlockEncryptionBase.cs
+++ b/Lidgren.Network/Encryption/NetBlockEncryptionBase.cs
@@ -35,7 +35,7 @@ namespace Lidgren.Network
 			int numBlocks = (int)Math.Ceiling((double)numBytes / (double)blockSize);
 			int dstSize = numBlocks * blockSize;
 
-			msg.EnsureBufferSize(dstSize * 8 + 2); // add 2 bytes for payload length at end
+			msg.EnsureBufferSize(dstSize * 8 + (4 * 8)); // add 4 bytes for payload length at end
 			msg.LengthBits = dstSize * 8; // length will automatically adjust +4 bytes when payload length is written
 
 			for(int i=0;i<numBlocks;i++)
@@ -45,7 +45,7 @@ namespace Lidgren.Network
 			}
 
 			// add true payload length last
-			msg.Write((ushort)payloadBitLength);
+			msg.Write((UInt32)payloadBitLength);
 
 			return true;
 		}
@@ -57,7 +57,7 @@ namespace Lidgren.Network
 		/// <returns>true if successful; false if failed</returns>
 		public bool Decrypt(NetIncomingMessage msg)
 		{
-			int numEncryptedBytes = msg.LengthBytes - 2; // last 2 bytes is true bit length
+			int numEncryptedBytes = msg.LengthBytes - 4; // last 4 bytes is true bit length
 			int blockSize = BlockSize;
 			int numBlocks = numEncryptedBytes / blockSize;
 			if (numBlocks * blockSize != numEncryptedBytes)
@@ -69,8 +69,8 @@ namespace Lidgren.Network
 				Buffer.BlockCopy(m_tmp, 0, msg.m_data, (i * blockSize), m_tmp.Length);
 			}
 
-			// read 16 bits of true payload length
-			uint realSize = NetBitWriter.ReadUInt32(msg.m_data, 16, (numEncryptedBytes * 8));
+			// read 32 bits of true payload length
+			uint realSize = NetBitWriter.ReadUInt32(msg.m_data, 32, (numEncryptedBytes * 8));
 			msg.m_bitLength = (int)realSize;
 			return true;
 		}
diff --git a/Lidgren.Network/NetIncomingMessage.Write.cs b/Lidgren.Network/NetIncomingMessage.Write.cs
index bce7c3a..a4e7622 100644
--- a/Lidgren.Network/NetIncomingMessage.Write.cs
+++ b/Lidgren.Network/NetIncomingMessage.Write.cs
@@ -438,17 +438,7 @@ namespace Lidgren.Network
 			}
 
 			byte[] bytes = Encoding.UTF8.GetBytes(source);
-
-			// determine number of bytes to store length
-			int lenBytesNeeded = 1;
-			uint num1 = (uint)bytes.Length;
-			while (num1 >= 0x80)
-			{
-				num1 = num1 >> 7;
-				lenBytesNeeded++;
-			}
-			InternalEnsureBufferSize(m_bitLength + ((bytes.Length + lenBytesNeeded) * 8));
-
+			InternalEnsureBufferSize(m_bitLength + ((bytes.Length + 2) * 8));
 			WriteVariableUInt32((uint)bytes.Length);
 			Write(bytes);
 		}