diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/PsiBasedStripTrailingSpacesFilter.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/PsiBasedStripTrailingSpacesFilter.java
index f01efd38a08e..43702487e004 100644
--- a/platform/core-impl/src/com/intellij/openapi/editor/impl/PsiBasedStripTrailingSpacesFilter.java
+++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/PsiBasedStripTrailingSpacesFilter.java
@@ -101,9 +101,12 @@ public abstract class PsiBasedStripTrailingSpacesFilter implements StripTrailing
     return null;
   }
 
-  protected final void disableRange(@NotNull TextRange range) {
+  protected final void disableRange(@NotNull TextRange range, boolean includeEndLine) {
     int startLine = myDocument.getLineNumber(range.getStartOffset());
     int endLine = myDocument.getLineNumber(range.getEndOffset());
+    if (includeEndLine) {
+      endLine++;
+    }
     myDisabledLinesBitSet.set(startLine, endLine);
   }
 }
diff --git a/plugins/properties/src/META-INF/plugin.xml b/plugins/properties/src/META-INF/plugin.xml
index 39790e977e67..e2fda174227b 100644
--- a/plugins/properties/src/META-INF/plugin.xml
+++ b/plugins/properties/src/META-INF/plugin.xml
@@ -118,6 +118,8 @@
     <gotoDeclarationHandler implementation="com.intellij.lang.properties.editor.GotoPropertyParentDeclarationHandler"/>
 
     <properties.implicitPropertyUsageProvider implementation="com.intellij.codeInspection.unused.LoggerConfigPropertyUsageProvider"/>
+
+    <stripTrailingSpacesFilterFactory implementation="com.intellij.lang.properties.formatting.PropertiesStripTrailingSpacesFilterFactory"/>
   </extensions>
 
   <project-components>
diff --git a/plugins/properties/src/com/intellij/lang/properties/formatting/PropertiesStripTrailingSpacesFilterFactory.java b/plugins/properties/src/com/intellij/lang/properties/formatting/PropertiesStripTrailingSpacesFilterFactory.java
new file mode 100644
index 000000000000..d9e47c0fc1d8
--- /dev/null
+++ b/plugins/properties/src/com/intellij/lang/properties/formatting/PropertiesStripTrailingSpacesFilterFactory.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2000-2016 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.formatting;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.Language;
+import com.intellij.lang.StdLanguages;
+import com.intellij.lang.properties.psi.impl.PropertyImpl;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.impl.PsiBasedStripTrailingSpacesFilter;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiRecursiveElementVisitor;
+import org.jetbrains.annotations.NotNull;
+
+public class PropertiesStripTrailingSpacesFilterFactory extends PsiBasedStripTrailingSpacesFilter.Factory {
+  @NotNull
+  @Override
+  protected PsiBasedStripTrailingSpacesFilter createFilter(@NotNull Document document) {
+    return new PsiBasedStripTrailingSpacesFilter(document) {
+      @Override
+      protected void process(@NotNull PsiFile psiFile) {
+        new PsiRecursiveElementVisitor() {
+          @Override
+          public void visitElement(PsiElement element) {
+            if (element instanceof PropertyImpl) {
+              final ASTNode valueNode = ((PropertyImpl)element).getValueNode();
+              if (valueNode != null) {
+                disableRange(valueNode.getTextRange(), true);
+              }
+            }
+            super.visitElement(element);
+          }
+        }.visitElement(psiFile);
+      }
+    };
+  }
+
+  @Override
+  protected boolean isApplicableTo(@NotNull Language language) {
+    return language.is(StdLanguages.PROPERTIES);
+  }
+}