From 30c361a56ba9eab3d1388dce3d5a46a096272125 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 23 Nov 2017 14:14:29 -0500
Subject: [PATCH] Fix Sieve path of mailboxes for filter editor

---
 NEWS                               | 1 +
 SoObjects/Mailer/SOGoMailAccount.m | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 9e82cee02..b93ab715c 100644
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,7 @@ Bug fixes
  - [web] prevent the creation of empty contact categories
  - [web] fixed mail composition from message headers (#4335)
  - [web] restore messages selection after automatic refresh (#4330)
+ - [web] fixed path of destination mailbox in Sieve filter editor
  - [eas] hebrew folders encoding problem using EAS (#4240)
  - [eas] avoid sync requests for shared folders every second (#4275)
 
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index 9dfd70d8a..f8342a65c 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -555,10 +555,10 @@ static NSString *inboxFolderName = @"INBOX";
 					  nil];
 
           if (sieveFolderUTF8Encoding)
-            sievePath = [folderPath stringByDecodingImap4FolderName];
+            sievePath = [currentPath stringByDecodingImap4FolderName];
           else
-            sievePath = folderPath;
-          [folder setObject: [sievePath substringFromIndex: 1] forKey: @"sievePath"];
+            sievePath = currentPath;
+          [folder setObject: sievePath forKey: @"sievePath"];
 
           // Either add this new folder to its parent or the list of root folders
           [folders addObject: folder];