diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 953e9cb83..4a55df480 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -231,6 +231,22 @@
- 1000
+
+ - @string/account_settings_folder_notify_new_mail_mode_all
+ - @string/account_settings_folder_notify_new_mail_mode_first_class
+ - @string/account_settings_folder_notify_new_mail_mode_first_and_second_class
+ - @string/account_settings_folder_notify_new_mail_mode_not_second_class
+ - @string/account_settings_folder_notify_new_mail_mode_none
+
+
+
+ - ALL
+ - FIRST_CLASS
+ - FIRST_AND_SECOND_CLASS
+ - NOT_SECOND_CLASS
+ - NONE
+
+
- @string/account_settings_folder_target_mode_all
- @string/account_settings_folder_target_mode_first_class
@@ -285,6 +301,20 @@
- INHERITED
+
+ - @string/folder_settings_folder_notify_mode_normal
+ - @string/folder_settings_folder_notify_mode_first_class
+ - @string/folder_settings_folder_notify_mode_second_class
+ - @string/folder_settings_folder_notify_mode_inherited
+
+
+
+ - NO_CLASS
+ - FIRST_CLASS
+ - SECOND_CLASS
+ - INHERITED
+
+
- @string/account_setup_incoming_delete_policy_never_label
- @string/account_setup_incoming_delete_policy_delete_label
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3522e7183..afa6335ce 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -509,6 +509,14 @@ Please submit bug reports, contribute new features and ask questions at
Default account
Send mail from this account by default
New mail notifications
+
+ Notifications folders
+ All
+ Only 1st Class folders
+ 1st and 2nd Class folders
+ All except 2nd Class folders
+ None
+
Sync notifications
Your email address
Notify in status bar when mail arrives
@@ -658,6 +666,12 @@ Please submit bug reports, contribute new features and ask questions at
2nd Class
Same as sync class
+ Folder notification class
+ None
+ 1st Class
+ 2nd Class
+ Same as push class
+
Incoming server
Configure the incoming mail server
Outgoing server
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index cbe23b4cd..6c65658ed 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -343,6 +343,15 @@
android:defaultValue="true"
android:summary="@string/account_settings_notify_summary" />
+
+
+
+
(FolderMode.class, FolderMode.ALL))
+ ));
s.put("notifySelfNewMail", Settings.versions(
new V(1, new BooleanSetting(true))
));
diff --git a/src/com/fsck/k9/preferences/FolderSettings.java b/src/com/fsck/k9/preferences/FolderSettings.java
index aae048092..4aa2cb46a 100644
--- a/src/com/fsck/k9/preferences/FolderSettings.java
+++ b/src/com/fsck/k9/preferences/FolderSettings.java
@@ -28,6 +28,9 @@ public class FolderSettings {
s.put("displayMode", Settings.versions(
new V(1, new EnumSetting(FolderClass.class, FolderClass.NO_CLASS))
));
+ s.put("notifyMode", Settings.versions(
+ new V(34, new EnumSetting(FolderClass.class, FolderClass.INHERITED))
+ ));
s.put("syncMode", Settings.versions(
new V(1, new EnumSetting(FolderClass.class, FolderClass.INHERITED))
));
diff --git a/src/com/fsck/k9/preferences/Settings.java b/src/com/fsck/k9/preferences/Settings.java
index 22ed1cb1f..694730673 100644
--- a/src/com/fsck/k9/preferences/Settings.java
+++ b/src/com/fsck/k9/preferences/Settings.java
@@ -35,7 +35,7 @@ public class Settings {
*
* @see SettingsExporter
*/
- public static final int VERSION = 33;
+ public static final int VERSION = 34;
public static Map validate(int version, Map> settings,