diff --git a/plugins/properties/src/META-INF/plugin.xml b/plugins/properties/src/META-INF/plugin.xml
index 6e8de1a88fbc..b5053ce9440b 100644
--- a/plugins/properties/src/META-INF/plugin.xml
+++ b/plugins/properties/src/META-INF/plugin.xml
@@ -10,6 +10,8 @@
     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <applicationService serviceInterface="com.intellij.lang.properties.LastSelectedPropertiesFileStore"
                         serviceImplementation="com.intellij.lang.properties.LastSelectedPropertiesFileStore"/>
+    <applicationService serviceInterface="com.intellij.lang.properties.refactoring.PropertiesRefactoringSettings"
+                        serviceImplementation="com.intellij.lang.properties.refactoring.PropertiesRefactoringSettings"/>
     <annotator language="Properties" implementationClass="com.intellij.lang.properties.PropertiesAnnotator"/>
     <completion.contributor language="Properties" implementationClass="com.intellij.lang.properties.PropertiesCompletionContributor"/>
     <lang.refactoringSupport language="Properties" implementationClass="com.intellij.lang.properties.refactoring.PropertiesRefactoringSupportProvider"/>
diff --git a/plugins/properties/src/com/intellij/lang/properties/refactoring/PropertiesRefactoringSettings.java b/plugins/properties/src/com/intellij/lang/properties/refactoring/PropertiesRefactoringSettings.java
new file mode 100644
index 000000000000..650f2ac0555c
--- /dev/null
+++ b/plugins/properties/src/com/intellij/lang/properties/refactoring/PropertiesRefactoringSettings.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2000-2012 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.lang.properties.refactoring;
+
+import com.intellij.openapi.components.*;
+import com.intellij.util.xmlb.XmlSerializerUtil;
+
+@State(
+  name = "PropertiesRefactoringSettings",
+  storages = {
+    @Storage(
+      file = StoragePathMacros.APP_CONFIG + "/other.xml"
+    )}
+)
+public class PropertiesRefactoringSettings implements PersistentStateComponent<PropertiesRefactoringSettings> {
+
+
+  public boolean RENAME_SEARCH_IN_COMMENTS = false;
+
+  public static PropertiesRefactoringSettings getInstance() {
+    return ServiceManager.getService(PropertiesRefactoringSettings.class);
+  }
+
+  public PropertiesRefactoringSettings getState() {
+    return this;
+  }
+
+  public void loadState(PropertiesRefactoringSettings state) {
+    XmlSerializerUtil.copyBean(state, this);
+  }
+}
\ No newline at end of file
diff --git a/plugins/properties/src/com/intellij/lang/properties/refactoring/RenamePropertyProcessor.java b/plugins/properties/src/com/intellij/lang/properties/refactoring/RenamePropertyProcessor.java
index 4119c3dc287f..6bdaa0957133 100644
--- a/plugins/properties/src/com/intellij/lang/properties/refactoring/RenamePropertyProcessor.java
+++ b/plugins/properties/src/com/intellij/lang/properties/refactoring/RenamePropertyProcessor.java
@@ -61,4 +61,14 @@ public class RenamePropertyProcessor extends RenamePsiElementProcessor {
       }
     }
   }
+
+  @Override
+   public boolean isToSearchInComments(PsiElement element) {
+     return PropertiesRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS;
+   }
+ 
+   @Override
+   public void setToSearchInComments(PsiElement element, boolean enabled) {
+     PropertiesRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS = enabled;
+   }
 }