From a3238417e747ea9208b8bf73cfd157d628bdfd4f Mon Sep 17 00:00:00 2001
From: Daniel Applebaum <danapple@danapple.com>
Date: Sat, 22 May 2010 15:10:20 +0000
Subject: [PATCH] Fixes Issue 1653

Merged from:
1718 | danapple0 | 2010-05-22 09:28:04 -0500 (Sat, 22 May 2010) | 5 lines

Fixes Issue 1653

All set the display class, whether or not in push mode.
---
 src/com/fsck/k9/activity/setup/AccountSettings.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index cfc79e762..2ea5b5d1c 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -384,11 +384,12 @@ public class AccountSettings extends K9PreferenceActivity
         needsRefresh |= mAccount.setFolderSyncMode(Account.FolderMode.valueOf(mSyncMode.getValue()));
         
         boolean needsPushRestart = mAccount.setFolderPushMode(Account.FolderMode.valueOf(mPushMode.getValue()));
+        boolean displayModeChanged = mAccount.setFolderDisplayMode(Account.FolderMode.valueOf(mDisplayMode.getValue()));
+        
         if (mAccount.getFolderPushMode() != FolderMode.NONE)
         {
-            needsPushRestart |= mAccount.setFolderDisplayMode(Account.FolderMode.valueOf(mDisplayMode.getValue()));
-            needsPushRestart |= mAccount.setMaxPushFolders(Integer.parseInt(mPushLimit.getValue()));
-            needsPushRestart |= mIncomingChanged;  
+            needsPushRestart |= displayModeChanged;
+            needsPushRestart |= mIncomingChanged;
         }
         
         SharedPreferences prefs = mAccountRingtone.getPreferenceManager().getSharedPreferences();