Merge pull request #588 from owncloud/fix-delete-fav-folder

Allow delete of messages in our special fav folder

lib/account.php

@@ -312,6 +312,8 @@ class Account {
 	 * @param int $messageId
 	 */
 	public function deleteMessage($sourceFolderId, $messageId) {
+		$mb = $this->getMailbox($sourceFolderId);
+		$hordeSourceMailBox = $mb->getHordeMailBox();
 		// by default we will create a 'Trash' folder if no trash is found
 		$trashId = "Trash";
 		$createTrash = true;
@@ -337,7 +339,6 @@ class Account {
 		}
 
 		$hordeMessageIds = new Horde_Imap_Client_Ids($messageId);
-		$hordeSourceMailBox = new Horde_Imap_Client_Mailbox($sourceFolderId);
 		$hordeTrashMailBox = new Horde_Imap_Client_Mailbox($trashId);
 
 		if ($sourceFolderId === $trashId) {

lib/mailbox.php

@@ -380,5 +380,9 @@ class Mailbox {
 		$query->ids(new Horde_Imap_Client_Ids("$fromUid:$toUid"));
 		return $this->getMessages(-1, -1, $query);
 	}
+
+	public function getHordeMailBox() {
+		return $this->mailBox;
+	}
 }