diff --git a/ChangeLog b/ChangeLog
index 04c23f0a..433b08a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 VERSION 0.6.4cvs
 ================
 
+2005-03-28  Vincent Richard  <vincent@vincent-richard.net>
+
+ * messaging/POP3Store.cpp: fixed POP3Store::sendPacket() to send "\r\n"
+   in the same packet as the request. This caused problems with some
+   servers (thanks to Donald Dade).
+
 2005-03-27  Stefan Uhrig <stefanuhrig@gmx.net>
 
  * Added Windows platform handlers.
diff --git a/src/messaging/POP3Store.cpp b/src/messaging/POP3Store.cpp
index 1ba77f8c..3129f14a 100644
--- a/src/messaging/POP3Store.cpp
+++ b/src/messaging/POP3Store.cpp
@@ -302,8 +302,10 @@ void POP3Store::stripResponseCode(const string& buffer, string& result)
 
 void POP3Store::sendRequest(const string& buffer, const bool end)
 {
-	m_socket->send(buffer);
-	if (end) m_socket->send("\r\n");
+	if (end)
+		m_socket->send(buffer + "\r\n");
+	else
+		m_socket->send(buffer);
 }