diff --git a/apps/susimail/src/WEB-INF/web.xml b/apps/susimail/src/WEB-INF/web.xml
index d5fa807a2..75aa1fd48 100644
--- a/apps/susimail/src/WEB-INF/web.xml
+++ b/apps/susimail/src/WEB-INF/web.xml
@@ -15,6 +15,20 @@
   <session-config>
     <session-timeout>1440</session-timeout>
   </session-config>
+  <!-- tomcat (untested) -->
+  <context-param>
+    <param-name>crossContext</param-name>
+    <param-value>false</param-value>
+  </context-param>
+  <!-- jetty
+    -  This is required so the same session ID isn't shared with
+    -  the base context. When shared, it's expired after 30 minutes
+    -  in the base context which invalidates it in our context too.
+    -->
+  <context-param>
+    <param-name>org.eclipse.jetty.servlet.SessionCookie</param-name>
+    <param-value>SUSIMAILJSESSIONID</param-value>
+  </context-param>
 
 <!--
      Jetty 6 mulipart form handling
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index aaaef423f..478e24126 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -1280,13 +1280,13 @@ public class WebMail extends HttpServlet
 			int newState = sessionObject.state;
 			if (oldState != newState)
 				Debug.debug(Debug.DEBUG, "STATE CHANGE from " + oldState + " to " + newState);
-			if (oldState == STATE_AUTH && newState != STATE_AUTH) {
-				// this isn't working in web.xml, so try setting it here
-				int oldIdle = httpSession.getMaxInactiveInterval();
-				httpSession.setMaxInactiveInterval(60*60*24);  // seconds
-				int newIdle = httpSession.getMaxInactiveInterval();
-				Debug.debug(Debug.DEBUG, "Changed idle from " + oldIdle + " to " + newIdle);
-			}
+			// Set in web.xml
+			//if (oldState == STATE_AUTH && newState != STATE_AUTH) {
+			//	int oldIdle = httpSession.getMaxInactiveInterval();
+			//	httpSession.setMaxInactiveInterval(60*60*24);  // seconds
+			//	int newIdle = httpSession.getMaxInactiveInterval();
+			//	Debug.debug(Debug.DEBUG, "Changed idle from " + oldIdle + " to " + newIdle);
+			//}
 			
 			if( sessionObject.state != STATE_AUTH )
 				processGenericButtons( sessionObject, request );