From 15be4861b6574ce7573e2ebc6e3d3bc3fb10110f Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 5 Nov 2014 08:44:52 -0500
Subject: [PATCH] Fix support for SieveFolderEncoding default

Fixes #2622
---
 NEWS                               | 1 +
 UI/PreferencesUI/UIxFilterEditor.m | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 1e52e5b9b..5ce79af5f 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Bug fixes
  - fixed ActiveSync PING command flooding the server (#2940)
  - fixed many interop issues with Windows Phones over ActiveSync
  - fixed automatic return receipts crash when not in the recepient list (#2965)
+ - fixed support for Sieve folder encoding parameter (#2622)
 
 2.2.9a (2014-09-29)
 -------------------
diff --git a/UI/PreferencesUI/UIxFilterEditor.m b/UI/PreferencesUI/UIxFilterEditor.m
index 964ff44b6..50ae1af15 100644
--- a/UI/PreferencesUI/UIxFilterEditor.m
+++ b/UI/PreferencesUI/UIxFilterEditor.m
@@ -1,6 +1,6 @@
 /* UIxFilterEditor.m - this file is part of SOGo
  *
- * Copyright (C) 2010-2013 Inverse inc.
+ * Copyright (C) 2010-2014 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +36,6 @@
 {
   NSString *filterId;
   NSDictionary *labels;
-  NSString *folderEncoding;
 }
 
 @end
@@ -114,9 +113,9 @@
   return [labels jsonRepresentation];
 }
 
-- (NSString *) folderEncoding
+- (NSString *) sieveFolderEncoding
 {
-  return [[SOGoSystemDefaults sharedSystemDefaults] folderEncoding];
+  return [[SOGoSystemDefaults sharedSystemDefaults] sieveFolderEncoding];
 }
 
 @end