Merge branch 'master' of github.com:/nextcloud/mail into refactor/account-cleanup

lib/Controller/FoldersController.php

@@ -23,13 +23,11 @@
 
 namespace OCA\Mail\Controller;
 
-use Horde_Imap_Client_Exception;
 use OCA\Mail\Contracts\IMailManager;
 use OCA\Mail\IMAP\Sync\Request as SyncRequest;
 use OCA\Mail\IMAP\Sync\Response as SyncResponse;
 use OCA\Mail\Service\AccountService;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;

lib/IMAP/FolderMapper.php

@@ -68,7 +68,7 @@ class FolderMapper {
 			$folders[] = $folder;
 			if ($mailbox['mailbox']->utf8 === 'INBOX') {
 				$searchFolder = new SearchFolder($account, $mailbox['mailbox'], $mailbox['attributes'], $mailbox['delimiter']);
-				if ($searchFolder->isSearchable()) {
+				if ($folder->isSearchable()) {
 					$searchFolder->setSyncToken($client->getSyncToken($folder->getMailbox()));
 				}
 				$folders[] = $searchFolder;