1 files changed, 5 insertions, 2 deletions

diff --git a/session.c b/session.c
index 4448e6f1f..bced1f65a 100644
--- a/session.c
+++ b/session.c
@@ -1050,8 +1050,11 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
 # endif /* HAVE_CYGWIN */
 #endif /* HAVE_LOGIN_CAP */
 
-        snprintf(buf, sizeof buf, "%.200s/%.50s", _PATH_MAILDIR, pw->pw_name);
-        child_set_env(&env, &envsize, "MAIL", buf);
+        if (!options.use_pam) {
+                snprintf(buf, sizeof buf, "%.200s/%.50s",
+                    _PATH_MAILDIR, pw->pw_name);
+                child_set_env(&env, &envsize, "MAIL", buf);
+        }
 
         /* Normal systems set SHELL by default. */
         child_set_env(&env, &envsize, "SHELL", shell);