diff --git a/Apache/SOGo.conf b/Apache/SOGo.conf
index 1762ebac3..853b5ae0e 100644
--- a/Apache/SOGo.conf
+++ b/Apache/SOGo.conf
@@ -59,7 +59,6 @@ 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" %{REMOTE_HOST}e env=REMOTE_HOST
 
   AddDefaultCharset UTF-8
 
@@ -67,8 +66,3 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
   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]
diff --git a/NEWS b/NEWS
index a30a8b00e..44bc2598d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@
 ------------------
 
 Enhancements
- - 
+ - Added logging of the X-Forwarded-For HTTP header (#2229)
 
 Bug fixes
  - Don't use the cache for password lookups from login page (#2169)