From 6465c95a91b32ca4215296cedf932ebfd7b35e41 Mon Sep 17 00:00:00 2001
From: djmaze <>
Date: Thu, 23 Dec 2021 12:20:40 +0100
Subject: [PATCH] Partial fix for #170

---
 dev/App/User.js                                    |  2 +-
 .../app/libraries/RainLoop/Actions/Messages.php    | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/dev/App/User.js b/dev/App/User.js
index a1a57d053..5c2e45232 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -216,7 +216,7 @@ class AppUser extends AbstractApp {
 	}
 
 	messagesCopyHelper(sFromFolderFullName, sToFolderFullName, aUidForCopy) {
-		Remote.request('MessageCopy', this.moveOrDeleteResponseHelper, {
+		Remote.request('MessageCopy', null, {
 			FromFolder: sFromFolderFullName,
 			ToFolder: sToFolderFullName,
 			Uids: aUidForCopy.join(',')
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 b471abcfa..2e83c2bf4 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
@@ -503,17 +503,16 @@ trait Messages
 		}
 
 		$sHash = '';
-
 		try
 		{
 			$sHash = $this->MailClient()->FolderHash($sFolder);
 		}
 		catch (\Throwable $oException)
 		{
-			unset($oException);
+			\error_log("FolderHash({$sFolder}) Exception: {$oException->getMessage()}");
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFolder, $sHash) : false);
+		return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFolder, $sHash) : array($sFromFolder));
 	}
 
 	/**
@@ -567,17 +566,16 @@ trait Messages
 		}
 
 		$sHash = '';
-
 		try
 		{
 			$sHash = $this->MailClient()->FolderHash($sFromFolder);
 		}
 		catch (\Throwable $oException)
 		{
-			unset($oException);
+			\error_log("FolderHash({$sFromFolder}) Exception: {$oException->getMessage()}");
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFromFolder, $sHash) : false);
+		return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFromFolder, $sHash) : array($sFromFolder));
 	}
 
 	/**
@@ -597,15 +595,13 @@ trait Messages
 		{
 			$this->MailClient()->MessageCopy($sFromFolder, $sToFolder,
 				$aFilteredUids, true);
-
-			$sHash = $this->MailClient()->FolderHash($sFromFolder);
 		}
 		catch (\Throwable $oException)
 		{
 			throw new ClientException(Notifications::CantCopyMessage, $oException);
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFromFolder, $sHash) : false);
+		return $this->TrueResponse(__FUNCTION__);
 	}
 
 	public function DoMessageUploadAttachments() : array