diff --git a/ChangeLog b/ChangeLog
index 0aad72d7..3573bd23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 VERSION 0.6.4cvs
 ================
 
+2005-04-09  Vincent Richard  <vincent@vincent-richard.net>
+
+ * encoderB64.cpp: fixed a bug in Base64 decoding. Bytes to be decoded
+   were not correctly initialized.
+
 2005-04-03  Vincent Richard  <vincent@vincent-richard.net>
 
  * messaging/*: moved IMAP, POP3, maildir and SMTP files to separate
diff --git a/src/encoderB64.cpp b/src/encoderB64.cpp
index 405eac25..bb78ac6a 100644
--- a/src/encoderB64.cpp
+++ b/src/encoderB64.cpp
@@ -186,6 +186,11 @@ const utility::stream::size_type encoderB64::decode(utility::inputStream& in, ut
 
 	while (bufferPos < bufferLength || !in.eof())
 	{
+		bytes[0] = '=';
+		bytes[1] = '=';
+		bytes[2] = '=';
+		bytes[3] = '=';
+
 		// Need to get more data?
 		if (bufferPos >= bufferLength)
 		{