--- C:\dev\msys\home\Olivier\source\filezilla-3.3.5.1\src\engine\ftpcontrolsocket.cpp.bak	2010-07-23 05:30:18.000000000 +0200
+++ C:\dev\msys\home\Olivier\source\filezilla-3.3.5.1\src\engine\ftpcontrolsocket.cpp	2010-11-23 22:42:02.828125000 +0100
@@ -3786,7 +3786,11 @@
 	   return false;
 
 	pData->port = port;
-	pData->host = m_pSocket->GetPeerIP();
+	
+	if (m_pProxyBackend)
+	    pData->host = GetCurrentServer()->GetHost();
+	else
+	    pData->host = m_pSocket->GetPeerIP();
 	return true;
 }