diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/PropertyFoldingBuilder.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/PropertyFoldingBuilder.java
index 9d31a84388bc..8c0f7ca0976b 100644
--- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/PropertyFoldingBuilder.java
+++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/folding/PropertyFoldingBuilder.java
@@ -24,7 +24,7 @@ public class PropertyFoldingBuilder extends FoldingBuilderEx {
 
   @NotNull
   public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement element, @NotNull Document document, boolean quick) {
-    if (!(element instanceof PsiJavaFile) || quick) {
+    if (!(element instanceof PsiJavaFile) || quick || !isFoldingsOn()) {
       return FoldingDescriptor.EMPTY;
     }
     final PsiJavaFile file = (PsiJavaFile) element;
@@ -46,6 +46,10 @@ public class PropertyFoldingBuilder extends FoldingBuilderEx {
     return result.toArray(new FoldingDescriptor[result.size()]);
   }
 
+  private static boolean isFoldingsOn() {
+    return JavaCodeFoldingSettings.getInstance().isCollapseI18nMessages();
+  }
+
   private static void checkLiteral(PsiLiteralExpression expression, List<FoldingDescriptor> result) {
     if (isI18nProperty(expression)) {
       final String msg = getI18nMessage(expression);
@@ -147,7 +151,7 @@ public class PropertyFoldingBuilder extends FoldingBuilderEx {
   }
 
   public boolean isCollapsedByDefault(@NotNull ASTNode node) {
-    return JavaCodeFoldingSettings.getInstance().isCollapseI18nMessages();
+    return isFoldingsOn();
   }