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 9effeaf44..9184d6e31 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
@@ -219,7 +219,7 @@ class MailClient
 	 * @throws \MailSo\Net\Exceptions\Exception
 	 * @throws \MailSo\Imap\Exceptions\Exception
 	 */
-	public function MessageMimeStream($mCallback, string $sFolderName, int $iIndex, bool $bIndexIsUid = true, string $sMimeIndex = '') : bool
+	public function MessageMimeStream($mCallback, string $sFolderName, int $iIndex, string $sMimeIndex) : bool
 	{
 		if (!\is_callable($mCallback))
 		{
@@ -238,7 +238,7 @@ class MailClient
 			\strlen($sMimeIndex)
 				? FetchType::BODY_PEEK.'['.$sMimeIndex.'.MIME]'
 				: FetchType::BODY_HEADER_PEEK),
-			$iIndex, $bIndexIsUid);
+			$iIndex, true);
 
 		if (\count($aFetchResponse))
 		{
@@ -296,7 +296,7 @@ class MailClient
 							$sContentType, $sFileName, $sMimeIndex);
 					}
 				}
-			)), $iIndex, $bIndexIsUid);
+			)), $iIndex, true);
 
 		return ($aFetchResponse && 1 === \count($aFetchResponse));
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
index f696902b8..772c4d83a 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
@@ -634,7 +634,7 @@ trait Messages
 											$mResult[$sTempName] = $sAttachment;
 										}
 									}
-								}, $sFolder, $iUid, true, $sMimeIndex);
+								}, $sFolder, $iUid, $sMimeIndex);
 						}
 						else
 						{
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
index f59ff3e6f..e2da87d72 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
@@ -25,7 +25,7 @@ trait Raw
 			{
 				\MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource);
 			}
-		}, $sFolder, $iUid, true, $sMimeIndex);
+		}, $sFolder, $iUid, $sMimeIndex);
 	}
 
 	public function RawDownload() : bool
@@ -326,7 +326,7 @@ trait Raw
 						}
 					}
 				}
-			}, $sFolder, $iUid, true, $sMimeIndex);
+			}, $sFolder, $iUid, $sMimeIndex);
 	}
 
 	private static function loadImage(string $data, bool $bDetectImageOrientation = true, int $iThumbnailBoxSize = 0) : \SnappyMail\Image
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 f08c26954..0dd07a20b 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
@@ -520,7 +520,7 @@ trait User
 					}
 				}
 
-			}, $sFolder, $iUid, true, $sMimeIndex);
+			}, $sFolder, $iUid, $sMimeIndex);
 
 		$aValues['FileHash'] = '';
 		if ($mResult)