diff --git a/server/pop3/pop3.go b/server/pop3/pop3.go
index caeb142..f98506e 100644
--- a/server/pop3/pop3.go
+++ b/server/pop3/pop3.go
@@ -239,7 +239,7 @@ func handleClient(conn net.Conn) {
 
 			size := len(raw)
 			sendData(conn, fmt.Sprintf("+OK %d octets", size))
-			sendData(conn, string(raw))
+			sendData(conn, strings.Replace(string(raw), "\n.", "\n..", -1))
 			sendData(conn, ".")
 
 		} else if cmd == "TOP" && state == TRANSACTION {