diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile
index 3ca64cbf..6761dc2e 100755
--- a/src/freedombone-app-mailpile
+++ b/src/freedombone-app-mailpile
@@ -220,8 +220,9 @@ function install_mailpile {
             function_check nginx_limits
             nginx_limits $MAILPILE_DOMAIN_NAME '15m'
             echo "    proxy_pass        http://localhost:${MAILPILE_PORT}/;" >> $mailpile_nginx_site
-            echo '    proxy_set_header  Host $host;' >> $mailpile_nginx_site
-            echo '    proxy_buffering   off;' >> $mailpile_nginx_site
+            echo '    proxy_set_header X-Forwarded-Host $host;' >> $mailpile_nginx_site
+            echo '    proxy_set_header X-Forwarded-Server $host;' >> $mailpile_nginx_site
+            echo '    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> $mailpile_nginx_site
             echo '  }' >> $mailpile_nginx_site
             echo '}' >> $mailpile_nginx_site
         else
@@ -245,8 +246,9 @@ function install_mailpile {
         function_check nginx_limits
         nginx_limits $MAILPILE_DOMAIN_NAME '15m'
         echo "    proxy_pass        http://localhost:${MAILPILE_PORT}/;" >> $mailpile_nginx_site
-        echo '    proxy_set_header  Host $host;' >> $mailpile_nginx_site
-        echo '    proxy_buffering   off;' >> $mailpile_nginx_site
+        echo '    proxy_set_header X-Forwarded-Host $host;' >> $mailpile_nginx_site
+        echo '    proxy_set_header X-Forwarded-Server $host;' >> $mailpile_nginx_site
+        echo '    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> $mailpile_nginx_site
         echo '  }' >> $mailpile_nginx_site
         echo '}' >> $mailpile_nginx_site
     fi