diff --git a/src/com/android/email/activity/setup/AccountSettings.java b/src/com/android/email/activity/setup/AccountSettings.java
index 45b058d8c..02379eaf9 100644
--- a/src/com/android/email/activity/setup/AccountSettings.java
+++ b/src/com/android/email/activity/setup/AccountSettings.java
@@ -278,9 +278,10 @@ public class AccountSettings extends PreferenceActivity {
           switch (requestCode) {
           case SELECT_AUTO_EXPAND_FOLDER:
             mAutoExpandFolder.setSummary(translateFolder(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER)));
-            return;
+            break;
           }
         }
+        super.onActivityResult(requestCode, resultCode, data);
     }
 
     @Override