diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
index 40d224d2a9..948b99ec14 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
@@ -63,7 +63,7 @@ public static function CreateStream(array $aSubStreams)
 			\stream_wrapper_register(self::STREAM_NAME, '\MailSo\Base\StreamWrappers\SubStreams');
 		}
 
-		$sHashName = \MailSo\Base\Utils::Md5Rand();
+		$sHashName = \MailSo\Base\Utils::Sha1Rand();
 
 		self::$aStreams[$sHashName] = \array_map(function ($mItem) {
 			return \is_resource($mItem) ? $mItem :
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
index 7acff4b918..ac5bf5b00c 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
@@ -1661,11 +1661,6 @@ public static function CharsetDetect(string $sStr) : string
 		return \is_string($mResult) && \strlen($mResult) ? $mResult : '';
 	}
 
-	public static function Md5Rand(string $sAdditionalSalt = '') : string
-	{
-		return \md5($sAdditionalSalt . \random_bytes(16));
-	}
-
 	public static function Sha1Rand(string $sAdditionalSalt = '') : string
 	{
 		return \sha1($sAdditionalSalt . \random_bytes(16));
@@ -1727,22 +1722,4 @@ public static function IdnToAscii(string $sStr, bool $bLowerIfAscii = false) : s
 
 		return ('' === $sUser ? '' : $sUser.'@').$sDomain;
 	}
-
-	public static function HashToId(string $sHash, string $sSalt = '') : int
-	{
-		$sData = $sHash ? Crypt::Decrypt(\hex2bin($sHash), \md5($sSalt)) : null;
-
-		$aMatch = array();
-		if ($sData && \preg_match('/^id:(\d+)$/', $sData, $aMatch) && isset($aMatch[1]))
-		{
-			return \is_numeric($aMatch[1]) ? (int) $aMatch[1] : null;
-		}
-
-		return null;
-	}
-
-	public static function IdToHash(int $iID, string $sSalt = '') : string
-	{
-		return \bin2hex(Crypt::Encrypt('id:'.$iID, \md5($sSalt)));
-	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php
index 2b7bbd8250..f1af9af138 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php
@@ -75,7 +75,7 @@ public static function Guid() : string
 		static $sCache = null;
 		if (null === $sCache)
 		{
-			$sCache = \substr(\MailSo\Base\Utils::Md5Rand(), -8);
+			$sCache = \substr(\MailSo\Base\Utils::Sha1Rand(), -8);
 		}
 
 		return $sCache;
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index be5d79879c..ad9fbaeea9 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -818,7 +818,7 @@ private function parseSearchString(string $sSearch) : array
 			{
 				do
 				{
-					$sKey = \MailSo\Base\Utils::Md5Rand();
+					$sKey = \MailSo\Base\Utils::Sha1Rand();
 				}
 				while (isset($aCache[$sKey]));
 
@@ -834,7 +834,7 @@ private function parseSearchString(string $sSearch) : array
 			{
 				do
 				{
-					$sKey = \MailSo\Base\Utils::Md5Rand();
+					$sKey = \MailSo\Base\Utils::Sha1Rand();
 				}
 				while (isset($aCache[$sKey]));
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php
index b6cfe8b9eb..0dfbf4354e 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php
@@ -369,7 +369,7 @@ private function generateNewMessageId(string $sHostName = '') : string
 		}
 
 		return '<'.
-			\MailSo\Base\Utils::Md5Rand($sHostName.
+			\MailSo\Base\Utils::Sha1Rand($sHostName.
 				(\MailSo\Base\Utils::FunctionExistsAndEnabled('getmypid') ? \getmypid() : '')).'@'.$sHostName.'>';
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index cb25763c93..654e7f0c12 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1760,7 +1760,7 @@ public function UploadBackground(): array
 							)) {
 								$oSettings = $this->SettingsProvider()->Load($oAccount);
 								if ($oSettings) {
-									$sHash = \MailSo\Base\Utils::Md5Rand($sName . APP_VERSION . APP_SALT);
+									$sHash = \MailSo\Base\Utils::Sha1Rand($sName . APP_VERSION . APP_SALT);
 
 									$oSettings->SetConf('UserBackgroundName', $sName);
 									$oSettings->SetConf('UserBackgroundHash', $sHash);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
index bd50d58787..08d2c5e069 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
@@ -62,7 +62,7 @@ public function ClearAdminAuthToken() : void
 
 	private function getAdminToken() : string
 	{
-		$sRand = \MailSo\Base\Utils::Md5Rand();
+		$sRand = \MailSo\Base\Utils::Sha1Rand();
 		if (!$this->Cacher(null, true)->Set(KeyPathHelper::SessionAdminKey($sRand), \time()))
 		{
 			$this->oLogger->Write('Cannot store an admin token',
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
index 9bdd69d158..683525a1bf 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
@@ -107,7 +107,7 @@ public function DoAttachmentsActions() : array
 			{
 				case 'zip':
 
-					$sZipHash = \MailSo\Base\Utils::Md5Rand();
+					$sZipHash = \MailSo\Base\Utils::Sha1Rand();
 					$sZipFileName = $oFilesProvider->GenerateLocalFullFileName($oAccount, $sZipHash);
 
 					if (!empty($sZipFileName)) {
@@ -528,7 +528,7 @@ protected function ClearSignMeData(\RainLoop\Model\Account $oAccount) : void
 
 	private function generateSignMeToken(string $sEmail) : string
 	{
-		return \MailSo\Base\Utils::Md5Rand(APP_SALT.$sEmail);
+		return \MailSo\Base\Utils::Sha1Rand(APP_SALT.$sEmail);
 	}
 
 	private function getMimeFileByHash(\RainLoop\Model\Account $oAccount, string $sHash) : array
@@ -553,7 +553,7 @@ private function getMimeFileByHash(\RainLoop\Model\Account $oAccount, string $sH
 
 				if ($oAccount && \is_resource($rResource))
 				{
-					$sHash = \MailSo\Base\Utils::Md5Rand($sFileNameIn.'~'.$sContentTypeIn);
+					$sHash = \MailSo\Base\Utils::Sha1Rand($sFileNameIn.'~'.$sContentTypeIn);
 					$rTempResource = $oFileProvider->GetFile($oAccount, $sHash, 'wb+');
 
 					if (\is_resource($rTempResource))
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
index ea7d88f3bf..2de35da739 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -72,7 +72,7 @@ public static function GetConnectionToken() : string
 		$sToken = static::GetCookie($sKey, null);
 		if (null === $sToken)
 		{
-			$sToken = \MailSo\Base\Utils::Md5Rand(APP_SALT);
+			$sToken = \MailSo\Base\Utils::Sha1Rand(APP_SALT);
 			static::SetCookie($sKey, $sToken, \time() + 60 * 60 * 24 * 30);
 		}
 
@@ -89,9 +89,9 @@ public static function GetShortToken() : string
 		$sKey = 'rlsession';
 
 		$sToken = static::GetCookie($sKey, null);
-		if (null === $sToken)
+		if (!$sToken)
 		{
-			$sToken = \MailSo\Base\Utils::Md5Rand(APP_SALT);
+			$sToken = \MailSo\Base\Utils::Sha1Rand(APP_SALT);
 			static::SetCookie($sKey, $sToken, 0);
 		}