diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
index cbd463a5a41..b9d5f6d62f6 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
@@ -53,11 +53,12 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
             return;
         }
 
-        String lineSeparator = System.getProperty("line.separator");
+        final PsiElement newLineWhitespace = JetPsiFactory.createWhiteSpace(body.getProject(), "\n");
 
         for (DescriptorClassMember selectedElement : selectedElements) {
 
-            body.addBefore(JetPsiFactory.createWhiteSpace(body.getProject(), lineSeparator + lineSeparator), body.getRBrace());
+            // TODO: Insert spaces should be done by formatter
+            body.addBefore(newLineWhitespace, body.getRBrace());
 
             final DeclarationDescriptor descriptor = selectedElement.getDescriptor();
             if (descriptor instanceof NamedFunctionDescriptor) {
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
index 6149034906a..23d204cb65a 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
@@ -47,7 +47,10 @@ public class ImportClassHelper {
 
         JetImportDirective newDirective = JetPsiFactory.createImportDirective(file.getProject(), importString);
 
-        String lineSeparator = System.getProperty("line.separator");
+        // TODO: Should be processed with formatter
+        final PsiElement newLineWhitespace = JetPsiFactory.createWhiteSpace(file.getProject(), "\n");
+        final PsiElement doubleLineWhitespace = JetPsiFactory.createWhiteSpace(file.getProject(), "\n\n");
+
         if (!importDirectives.isEmpty()) {
 
             // Check if import is already present
@@ -59,14 +62,14 @@ public class ImportClassHelper {
 
             JetImportDirective lastDirective = importDirectives.get(importDirectives.size() - 1);
             lastDirective.getParent().addAfter(newDirective, lastDirective);
-            lastDirective.getParent().addAfter(JetPsiFactory.createWhiteSpace(file.getProject(), lineSeparator), lastDirective);
+            lastDirective.getParent().addAfter(newLineWhitespace, lastDirective);
         }
         else {
             List<JetDeclaration> declarations = file.getDeclarations();
             assert !declarations.isEmpty();
             JetDeclaration firstDeclaration = declarations.iterator().next();
             firstDeclaration.getParent().addBefore(newDirective, firstDeclaration);
-            firstDeclaration.getParent().addBefore(JetPsiFactory.createWhiteSpace(file.getProject(), lineSeparator + lineSeparator), firstDeclaration);
+            firstDeclaration.getParent().addBefore(doubleLineWhitespace, firstDeclaration);
         }
     }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after b/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
index 4b2a5d489d5..962f03764e9 100644
--- a/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after
@@ -11,10 +11,8 @@ class SomeOther<S> : Some<S> {
     override fun someFoo() {
         throw UnsupportedOperationException()
     }
-
     override fun someGenericFoo(): S {
         throw UnsupportedOperationException()
     }
-
     override fun someOtherFoo(): Int = 0
 }
\ No newline at end of file