Added intranet-mail and upgraded other module