diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php
index 59a249d70..c3d0fdff6 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php
@@ -32,7 +32,7 @@ abstract class Collection extends \ArrayObject implements \JsonSerializable
 	{
 		if ($bToTop) {
 			$array = $this->getArrayCopy();
-			array_unshift($array, $mItem);
+			\array_unshift($array, $mItem);
 			$this->exchangeArray($array);
 		} else {
 			parent::append($mItem);
@@ -53,23 +53,23 @@ abstract class Collection extends \ArrayObject implements \JsonSerializable
 	public function Slice(int $offset, int $length = null, bool $preserve_keys = false)
 	{
 		return new static(
-			array_slice($this->getArrayCopy(), $offset, $length, $preserve_keys)
+			\array_slice($this->getArrayCopy(), $offset, $length, $preserve_keys)
 		);
 	}
 
 	public function Crop(int $length = null, int $offset = 0, bool $preserve_keys = false)
 	{
 		$this->exchangeArray(
-			array_slice($this->getArrayCopy(), $offset, $length, $preserve_keys)
+			\array_slice($this->getArrayCopy(), $offset, $length, $preserve_keys)
 		);
 		return $this;
 	}
 
 	public function jsonSerialize()
 	{
-		$aNames = explode('\\', get_class($this));
+		$aNames = \explode('\\', \get_class($this));
 		return array(
-			'@Object' => 'Collection/' . end($aNames),
+			'@Object' => 'Collection/' . \end($aNames),
 			'@Count' => $this->Count(),
 			'@Collection' => $this->getArrayCopy()
 		);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Exceptions/Exception.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Exceptions/Exception.php
index bca2940af..6240472a4 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Exceptions/Exception.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Exceptions/Exception.php
@@ -20,8 +20,8 @@ class Exception extends \Exception
 {
 	public function __construct(string $sMessage = '', int $iCode = 0, \Throwable $oPrevious = null)
 	{
-		$sMessage = 0 === strlen($sMessage) ? str_replace('\\', '-', get_class($this)).' ('.
-			basename($this->getFile()).' ~ '.$this->getLine().')' : $sMessage;
+		$sMessage = \strlen($sMessage) ? $sMessage
+			: \str_replace('\\', '-', \get_class($this)).' ('.\basename($this->getFile()).' ~ '.$this->getLine().')';
 
 		parent::__construct($sMessage, $iCode, $oPrevious);
 	}