diff --git a/NEWS b/NEWS
index 16c3d1a7b..d3349ca4c 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ Bug fixes
  - [web] fixed and improved IMAP folder subscriptions manager (#3865)
  - [web] fixed Sieve script activation when vacation start date is in the future (#3885)
  - [web] fixed moving a component without the proper rights (#3889)
+ - [web] restored Sieve folder encoding support (#3904)
 
 3.2.1 (2016-11-02)
 ------------------
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index 38b27f29e..6801c4653 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -319,11 +319,27 @@
 "Header" = "Header";
 "Body" = "Body";
 "Flag the message with" = "Flag the message with";
+
+/* Select field label of "flag message" mail filter action */
+"Flag" = "Flag";
+
 "Discard the message" = "Discard the message";
 "File the message in" = "File the message in";
+
+/* Select field label of "file message" mail filter action */
+"Mailbox" = "Mailbox";
+
 "Keep the message" = "Keep the message";
 "Forward the message to" = "Forward the message to";
+
+/* Input field label of "forward" mail filter action */
+"Email" = "Email";
+
 "Send a reject message" = "Send a reject message";
+
+/* Input field label of "reject" mail filter action */
+"Message" = "Message";
+
 "Send a vacation message" = "Send a vacation message";
 "Stop processing filter rules" = "Stop processing filter rules";
 "is under" = "is under";
diff --git a/UI/PreferencesUI/UIxFilterEditor.m b/UI/PreferencesUI/UIxFilterEditor.m
index 275111cad..39bd094ad 100644
--- a/UI/PreferencesUI/UIxFilterEditor.m
+++ b/UI/PreferencesUI/UIxFilterEditor.m
@@ -111,9 +111,4 @@
   return [labels jsonRepresentation];
 }
 
-- (NSString *) sieveFolderEncoding
-{
-  return [[SOGoSystemDefaults sharedSystemDefaults] sieveFolderEncoding];
-}
-
 @end
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 28f62d645..28393873a 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -1622,6 +1622,14 @@ static NSArray *reminderValues = nil;
            userCanChangePassword];
 }
 
+//
+// Used wox by template
+//
+- (NSString *) sieveFolderEncoding
+{
+  return [[SOGoSystemDefaults sharedSystemDefaults] sieveFolderEncoding];
+}
+
 // - (NSString *) localeCode
 // {
 //   // WARNING : NSLocaleCode is not defined in <Foundation/NSUserDefaults.h>
diff --git a/UI/Templates/PreferencesUI/UIxFilterEditor.wox b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
index ac9ba943b..ef9af8321 100644
--- a/UI/Templates/PreferencesUI/UIxFilterEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
@@ -26,7 +26,6 @@
     <md-dialog-content class="sg-has-form-sections">
       <script type="text/javascript">
         var filterId = '<var:string value="filterId"/>';
-        var sieveFolderEncoding = '<var:string value="sieveFolderEncoding"/>';
         var mailTags = <var:string value="labels" const:escapeHTML="NO"/>;
       </script>
 
@@ -51,7 +50,7 @@
         </div>
 
         <!-- CONDITIONS -->
-        <div layout="column">
+        <div layout="column" ng-hide="filterEditor.filter.match == 'allmessages'">
           <div id="filterRules"><!-- empty --></div>
           <div layout="row" layout-align="start center"
                ng-repeat="rule in filterEditor.filter.rules">
@@ -165,7 +164,7 @@
                 <md-option value="flagged"><var:string label:value="Flagged"/></md-option>
                 <md-option value="junk"><var:string label:value="Junk"/></md-option>
                 <md-option value="not_junk"><var:string label:value="Not Junk"/></md-option>
-                <md-option ng-value="key" ng-repeat="(key, value) in labels">{{ value[0] }}</md-option>
+                <md-option ng-value="key" ng-repeat="(key, value) in filterEditor.labels">{{ value[0] }}</md-option>
               </md-select>
             </md-input-container>
 
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index b61b17dc1..033d8dc4b 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -21,6 +21,7 @@
     var defaultEmailAddresses = '<var:string value="defaultEmailAddresses" const:escapeHTML="NO"/>';
     var forwardConstraints = <var:string value="forwardConstraints" const:escapeHTML="NO"/>;
     var sieveCapabilities = <var:string value="sieveCapabilities" const:escapeHTML="NO"/>;
+    var sieveFolderEncoding = <var:string value="sieveFolderEncoding.doubleQuotedString"/>;
   </script>
 
   <script type="text/ng-template" id="preferences.html">
diff --git a/UI/WebServerResources/js/Preferences/FiltersDialogController.js b/UI/WebServerResources/js/Preferences/FiltersDialogController.js
index 583e33ea4..05645e6eb 100644
--- a/UI/WebServerResources/js/Preferences/FiltersDialogController.js
+++ b/UI/WebServerResources/js/Preferences/FiltersDialogController.js
@@ -12,7 +12,8 @@
     var vm = this,
         sieveCapabilities = $window.sieveCapabilities,
         forwardEnabled = $window.forwardEnabled,
-        vacationEnabled = $window.vacationEnabled;
+        vacationEnabled = $window.vacationEnabled,
+        sieveFolderPathAttribute = ($window.sieveFolderEncoding == "UTF-8") ? "name" : "path";
 
     vm.filter = filter;
     vm.mailboxes = mailboxes;
@@ -50,6 +51,12 @@
     //if (vacationEnabled)
     //  vm.methodLabels.vacation = l("Send a vacation message");
 
+    vm.mailboxes = _.map(mailboxes, function(mailbox) {
+      return { level: mailbox.level,
+               name: mailbox.name,
+               path: mailbox[sieveFolderPathAttribute] };
+    });
+
     if (sieveCapabilities.indexOf("reject") > -1)
       vm.methodLabels.reject = l("Send a reject message");