diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
index fbf7ec3993af..4d43804cfd49 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
@@ -762,11 +762,6 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
       doDecapitalize = true;
     }
 
-    if (name.startsWith(IS_PREFIX) && name.length() > IS_PREFIX.length() && Character.isUpperCase(name.charAt(IS_PREFIX.length()))) {
-      name = name.substring(IS_PREFIX.length());
-      doDecapitalize = true;
-    }
-
     if (doDecapitalize) {
       name = Introspector.decapitalize(name);
     }
diff --git a/java/java-psi-api/src/com/intellij/psi/util/PropertyUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PropertyUtil.java
index b9971f7d1ca4..9c93a085698b 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/PropertyUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/PropertyUtil.java
@@ -38,6 +38,7 @@ import java.util.*;
  * @author Mike
  */
 public class PropertyUtil {
+  @NonNls private static final String IS_PREFIX = "is";
   private static final Logger LOG = Logger.getInstance("#com.intellij.psi.util.PropertyUtil");
 
   private PropertyUtil() {
@@ -63,9 +64,9 @@ public class PropertyUtil {
       PsiType returnType = method.getReturnType();
       if (returnType != null && PsiType.VOID.equals(returnType)) return false;
     }
-    else if (methodName.startsWith("is") && methodNameLength > "is".length()) {
-      if (Character.isLowerCase(methodName.charAt("is".length()))
-          && (methodNameLength == "is".length() + 1 || Character.isLowerCase(methodName.charAt("is".length() + 1)))) {
+    else if (methodName.startsWith(IS_PREFIX) && methodNameLength > IS_PREFIX.length()) {
+      if (Character.isLowerCase(methodName.charAt(IS_PREFIX.length()))
+          && (methodNameLength == IS_PREFIX.length() + 1 || Character.isLowerCase(methodName.charAt(IS_PREFIX.length() + 1)))) {
         return false;
       }
       PsiType returnType = method.getReturnType();
@@ -323,7 +324,7 @@ public class PropertyUtil {
     @NonNls StringBuffer name = new StringBuffer(StringUtil.capitalizeWithJavaBeanConvention(propertyName));
     if (isBoolean(propertyType)) {
       if (existingGetterName == null || !existingGetterName.startsWith("get")) {
-        name.insert(0, "is");
+        name.insert(0, IS_PREFIX);
       }
       else {
         name.insert(0, "get");
@@ -343,7 +344,7 @@ public class PropertyUtil {
   @NonNls
   public static String[] suggestGetterNames(String propertyName) {
     final String str = StringUtil.capitalizeWithJavaBeanConvention(propertyName);
-    return new String[] { "is" + str, "get" + str };
+    return new String[] { IS_PREFIX + str, "get" + str };
   }
 
   public static String suggestSetterName(@NonNls String propertyName) {
@@ -532,7 +533,13 @@ public class PropertyUtil {
   public static String suggestPropertyName(Project project, PsiField field) {
     JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(project);
     VariableKind kind = codeStyleManager.getVariableKind(field);
-    return codeStyleManager.variableNameToPropertyName(field.getName(), kind);
+    String name = codeStyleManager.variableNameToPropertyName(field.getName(), kind);
+    if (!field.hasModifierProperty(PsiModifier.STATIC) && isBoolean(field.getType())) {
+      if (name.startsWith(IS_PREFIX) && name.length() > IS_PREFIX.length() && Character.isUpperCase(name.charAt(IS_PREFIX.length()))) {
+        name = Introspector.decapitalize(name.substring(IS_PREFIX.length()));
+      }
+    }
+    return name;
   }
 
   public static String suggestGetterName(Project project, PsiField field) {
@@ -850,8 +857,8 @@ public static PsiMethod getReversePropertyMethod(PsiMethod propertyMethod) {
   if (methodName.startsWith("get")) {
     prefix = "get";
   }
-  else if (methodName.startsWith("is")) {
-    prefix = "is";
+  else if (methodName.startsWith(IS_PREFIX)) {
+    prefix = IS_PREFIX;
   }
   else if (methodName.startsWith("set")) {
     prefix = "set";
@@ -875,7 +882,7 @@ public static PsiMethod getReversePropertyMethod(PsiMethod propertyMethod) {
     if (result != null) {
       return result;
     }
-    return findPropertyMethod(aClass, "is", name, field);
+    return findPropertyMethod(aClass, IS_PREFIX, name, field);
   }
   else {
     return findPropertyMethod(aClass, "set", name, field);
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/GenerateGetterSetterTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/GenerateGetterSetterTest.groovy
new file mode 100644
index 000000000000..e845ae35ded3
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/GenerateGetterSetterTest.groovy
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight
+import com.intellij.codeInsight.generation.ClassMember
+import com.intellij.codeInsight.generation.GenerateGetterHandler
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
+import org.jetbrains.annotations.Nullable
+/**
+ * @author peter
+ */
+class GenerateGetterSetterTest extends LightCodeInsightFixtureTestCase {
+
+  public void "test don't strip is of non-boolean fields"() {
+    myFixture.addClass('class YesNoRAMField {}')
+    myFixture.configureByText 'a.java', '''
+class Foo {
+    YesNoRAMField isStateForceMailField;
+
+    <caret>
+}
+'''
+    generateGetter()
+    myFixture.checkResult '''
+class Foo {
+    YesNoRAMField isStateForceMailField;
+
+    public YesNoRAMField getIsStateForceMailField() {
+        return isStateForceMailField;
+    }}
+'''
+  }
+  
+  public void "test strip is of boolean fields"() {
+    myFixture.configureByText 'a.java', '''
+class Foo {
+    boolean isStateForceMailField;
+
+    <caret>
+}
+'''
+    generateGetter()
+    myFixture.checkResult '''
+class Foo {
+    boolean isStateForceMailField;
+
+    public boolean isStateForceMailField() {
+        return isStateForceMailField;
+    }}
+'''
+  }
+
+  private void generateGetter() {
+    new GenerateGetterHandler() {
+      @Override
+      protected ClassMember[] chooseMembers(
+        ClassMember[] members,
+        boolean allowEmptySelection,
+        boolean copyJavadocCheckbox,
+        Project project,
+        @Nullable @Nullable Editor editor) {
+        return members
+      }
+    }.invoke(project, myFixture.editor, myFixture.file)
+  }
+}