Reactivating session timeout with bugs fixed. Added small change to Mailer