diff --git a/Apache/SOGo-debian.conf b/Apache/SOGo-debian.conf
index aced3f41a..7921d91bd 100644
--- a/Apache/SOGo-debian.conf
+++ b/Apache/SOGo-debian.conf
@@ -52,10 +52,16 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 #  RequestHeader set "x-webobjects-remote-user" "%{REMOTE_USER}e"
 
   RequestHeader set "x-webobjects-server-protocol" "HTTP/1.0"
-  RequestHeader set "x-webobjects-remote-host" "127.0.0.1"
+  RequestHeader set "x-webobjects-remote-host" %{REMOTE_HOST}e env=REMOTE_HOST
 
   AddDefaultCharset UTF-8
 
   Order allow,deny
   Allow from all
 </Proxy>
+
+## We use mod_rewrite to pass remote address to the SOGo proxy.
+# The remote address will appear in SOGo's log files and in the X-Forward
+# header of emails.
+RewriteEngine On
+RewriteRule ^/SOGo/(.*)$ /SOGo/$1 [env=REMOTE_HOST:%{REMOTE_ADDR},PT]
\ No newline at end of file