diff --git a/res/values/strings.xml b/res/values/strings.xml
index 294c2bb77..22b644b25 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -165,7 +165,7 @@
     <!-- Checkbox label, shown only on debug screen -->
     <string name="debug_enable_sensitive_logging_label">Enable sensitive information debug logging? (May show passwords in logs.)</string>
     <!-- Checkbox label, shown only on debug screen -->
-    <string name="debug_enable_exchange_logging_label">Enable exchange debug logging?</string>
+    <string name="debug_enable_exchange_logging_label">Enable exchange parser logging? (Extremely verbose)</string>
     <!-- Checkbox label, shown only on debug screen -->
     <string name="debug_enable_exchange_file_logging_label">Enable exchange sd card logging?</string>
 
diff --git a/src/com/android/exchange/Eas.java b/src/com/android/exchange/Eas.java
index 9ecb77f41..3702222fb 100644
--- a/src/com/android/exchange/Eas.java
+++ b/src/com/android/exchange/Eas.java
@@ -76,10 +76,7 @@ public class Eas {
             USER_LOG = (state & DEBUG_BIT) != 0;
             PARSER_LOG = (state & DEBUG_EXCHANGE_BIT) != 0;
             FILE_LOG = (state & DEBUG_FILE_BIT) != 0;
-            if (FILE_LOG) {
-                PARSER_LOG = true;
-                USER_LOG = true;
-            } else if (PARSER_LOG) {
+            if (FILE_LOG || PARSER_LOG) {
                 USER_LOG = true;
             }
             Log.d("Eas Debug", "Logging: " + (USER_LOG ? "User " : "") +