diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
index ff8f3473af5..1e75ed039e7 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
+++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
@@ -88,6 +88,8 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder {
                 .afterInside(LT, TYPE_ARGUMENT_LIST).spaces(0)
                 .beforeInside(GT, TYPE_ARGUMENT_LIST).spaces(0)
 
+                .betweenInside(FOR_KEYWORD, LPAR, FOR).spacing(1, 1, 0, false, 0)
+
                 // TODO: Ask for better API
                 // Type of the declaration colon
                 .beforeInside(COLON, PROPERTY).spaceIf(jetSettings.SPACE_BEFORE_TYPE_COLON)
diff --git a/idea/testData/formatter/ForSpacing.after.kt b/idea/testData/formatter/ForSpacing.after.kt
new file mode 100644
index 00000000000..92c11211806
--- /dev/null
+++ b/idea/testData/formatter/ForSpacing.after.kt
@@ -0,0 +1,8 @@
+fun f() {
+    for (i in array(1, 2)) {
+    }
+    for (i in array(1, 2)) {
+    }
+    for (i in array(1, 2)) {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/formatter/ForSpacing.kt b/idea/testData/formatter/ForSpacing.kt
new file mode 100644
index 00000000000..556d77bf338
--- /dev/null
+++ b/idea/testData/formatter/ForSpacing.kt
@@ -0,0 +1,9 @@
+fun f() {
+    for(i in array(1, 2)) {
+    }
+    for  (i in array(1, 2)) {
+    }
+    for
+    (i in array(1, 2)) {
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
index 8302ba5131f..4a42569288a 100644
--- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
@@ -67,6 +67,11 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
         doTest("idea/testData/formatter/ForNoBraces.kt");
     }
     
+    @TestMetadata("ForSpacing.kt")
+    public void testForSpacing() throws Exception {
+        doTest("idea/testData/formatter/ForSpacing.kt");
+    }
+    
     @TestMetadata("FunctionCallParametersAlign.kt")
     public void testFunctionCallParametersAlign() throws Exception {
         doTest("idea/testData/formatter/FunctionCallParametersAlign.kt");